jab2870
/
sxmo-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

various indentation fixes (spaces to tabs and stripping trailing whitespace)

Browse Source
master
Maarten van Gompel 4 years ago
parent 24380603a4
commit 7fb7cd70f3
15 changed files with 107 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      scripts/appscripts/sxmo_record.sh
  2. 4
      scripts/appscripts/sxmo_weather.sh
  3. 68
      scripts/core/sxmo_appmenu.sh
  4. 2
      scripts/core/sxmo_gpsutil.sh
  5. 70
      scripts/core/sxmo_lisgdstart.sh
  6. 2
      scripts/core/sxmo_networks.sh
  7. 2
      scripts/core/sxmo_pipecomplete.sh
  8. 4
      scripts/core/sxmo_urlhandler.sh
  9. 2
      scripts/modem/sxmo_modemsendsms.sh
  10. 4
      scripts/notifications/sxmo_notificationmonitor.sh

4
scripts/appscripts/sxmo_record.sh
Unescape View File

@ -95,7 +95,7 @@ recordmenu() {
} }
if [ -z "$1" ]; then if [ -z "$1" ]; then
recordmenu recordmenu
else else
"$@" "$@"
fi fi

4
scripts/appscripts/sxmo_weather.sh
Unescape View File

@ -133,7 +133,7 @@ weathermenu() {
sxmo_dmenu_with_kb.sh -i -c -l 10 -fn Terminus-18 -p "Locations" sxmo_dmenu_with_kb.sh -i -c -l 10 -fn Terminus-18 -p "Locations"
)" )"
if [ "$CHOICE" = "Close Menu" ]; then if [ "$CHOICE" = "Close Menu" ]; then
exit 0 exit 0
else else
PLACE="$(printf %b "$CHOICE" | cut -d: -f1 | awk '{$1=$1};1')" PLACE="$(printf %b "$CHOICE" | cut -d: -f1 | awk '{$1=$1};1')"
LAT="$(printf %b "$CHOICE" | cut -d: -f2- | awk '{$1=$1};1' | cut -d ' ' -f1)" LAT="$(printf %b "$CHOICE" | cut -d: -f2- | awk '{$1=$1};1' | cut -d ' ' -f1)"
@ -143,7 +143,7 @@ weathermenu() {
} }
if [ -z "$1" ]; then if [ -z "$1" ]; then
weathermenu weathermenu
else else
"$@" "$@"
fi fi

68
scripts/core/sxmo_appmenu.sh
Unescape View File

@ -30,7 +30,7 @@ programchoicesinit() {
find "$XDG_CONFIG_HOME/sxmo/userscripts" \( -type f -o -type l \) -print0 | find "$XDG_CONFIG_HOME/sxmo/userscripts" \( -type f -o -type l \) -print0 |
xargs -IF basename F | xargs -IF basename F |
awk '{printf "%s\t^ 0 ^ $XDG_CONFIG_HOME/sxmo/userscripts/%s \n", $0, $0}' | awk '{printf "%s\t^ 0 ^ $XDG_CONFIG_HOME/sxmo/userscripts/%s \n", $0, $0}' |
sort -f sort -f
) )
$CHOICES $CHOICES
Edit Userscripts ^ 0 ^ sxmo_files.sh $XDG_CONFIG_HOME/sxmo/userscripts Edit Userscripts ^ 0 ^ sxmo_files.sh $XDG_CONFIG_HOME/sxmo/userscripts
@ -137,47 +137,47 @@ programchoicesinit() {
elif echo "$WMCLASS" | grep -i "mpv"; then elif echo "$WMCLASS" | grep -i "mpv"; then
# MPV # MPV
CHOICES=" CHOICES="
Pause ^ 0 ^ key space Pause ^ 0 ^ key space
Seek ← ^ 1 ^ key Left Seek ← ^ 1 ^ key Left
Seek → ^ 1 ^ key Right Seek → ^ 1 ^ key Right
App Volume ↑ ^ 1 ^ key 0 App Volume ↑ ^ 1 ^ key 0
App Volume ↓ ^ 1 ^ key 9 App Volume ↓ ^ 1 ^ key 9
Speed ↑ ^ 1 ^ key bracketright Speed ↑ ^ 1 ^ key bracketright
Speed ↓ ^ 1 ^ key bracketleft Speed ↓ ^ 1 ^ key bracketleft
Screenshot ^ 1 ^ key s Screenshot ^ 1 ^ key s
Loopmark ^ 1 ^ key l Loopmark ^ 1 ^ key l
Info ^ 1 ^ key i Info ^ 1 ^ key i
Seek Info ^ 1 ^ key o Seek Info ^ 1 ^ key o
" "
WINNAME=Mpv && return WINNAME=Mpv && return
elif echo "$WMCLASS" | grep -i "feh"; then elif echo "$WMCLASS" | grep -i "feh"; then
# Feh # Feh
CHOICES=" CHOICES="
Next → ^ 1 ^ key space Next → ^ 1 ^ key space
Previous ← ^ 1 ^ key BackSpace Previous ← ^ 1 ^ key BackSpace
Zoom + ^ 1 ^ key up Zoom + ^ 1 ^ key up
Zoom - ^ 1 ^ key down Zoom - ^ 1 ^ key down
Zoom to fit ^ 1 ^ key slash Zoom to fit ^ 1 ^ key slash
Zoom to fill ^ 1 ^ key exlam Zoom to fill ^ 1 ^ key exlam
Rotate ↺ ^ 1 ^ key less Rotate ↺ ^ 1 ^ key less
Rotate ↻ ^ 1 ^ key greater Rotate ↻ ^ 1 ^ key greater
Flip ⇅ ^ 1 ^ key underscore Flip ⇅ ^ 1 ^ key underscore
Mirror ⇄ ^ 1 ^ key bar Mirror ⇄ ^ 1 ^ key bar
Toggle filename ^ 1 ^ key d Toggle filename ^ 1 ^ key d
" "
WINNAME=Feh && return WINNAME=Feh && return
elif echo "$WMCLASS" | grep -i "sxiv"; then elif echo "$WMCLASS" | grep -i "sxiv"; then
# Sxiv # Sxiv
CHOICES=" CHOICES="
Next → ^ 1 ^ key space Next → ^ 1 ^ key space
Previous ← ^ 1 ^ key BackSpace Previous ← ^ 1 ^ key BackSpace
Zoom + ^ 1 ^ key equal Zoom + ^ 1 ^ key equal
Zoom - ^ 1 ^ key minus Zoom - ^ 1 ^ key minus
Rotate ↺ ^ 1 ^ key less Rotate ↺ ^ 1 ^ key less
Rotate ↻ ^ 1 ^ key greater Rotate ↻ ^ 1 ^ key greater
Flip ⇄ ^ 1 ^ key question Flip ⇄ ^ 1 ^ key question
Flip ⇅ ^ 1 ^ key bar Flip ⇅ ^ 1 ^ key bar
Thumbnail ⊡ ^ 0 ^ key Return Thumbnail ⊡ ^ 0 ^ key Return
" "
WINNAME=Sxiv && return WINNAME=Sxiv && return
elif echo "$WMCLASS" | grep -i "st-256color"; then elif echo "$WMCLASS" | grep -i "st-256color"; then
@ -344,10 +344,10 @@ programchoicesinit() {
elif echo "$WMCLASS" | grep -i foxtrot; then elif echo "$WMCLASS" | grep -i foxtrot; then
# Foxtrot GPS # Foxtrot GPS
CHOICES=' CHOICES='
Locations ^ 0 ^ sxmo_gpsutil.sh menulocations Locations ^ 0 ^ sxmo_gpsutil.sh menulocations
Copy ^ 1 ^ sxmo_gpsutil.sh copy Copy ^ 1 ^ sxmo_gpsutil.sh copy
Paste ^ 0 ^ sxmo_gpsutil.sh paste Paste ^ 0 ^ sxmo_gpsutil.sh paste
Drop Pin ^ 0 ^ sxmo_gpsutil.sh droppin Drop Pin ^ 0 ^ sxmo_gpsutil.sh droppin
Region Search ^ 0 ^ sxmo_gpsutil.sh menuregionsearch Region Search ^ 0 ^ sxmo_gpsutil.sh menuregionsearch
Region Details ^ 0 ^ sxmo_gpsutil.sh details Region Details ^ 0 ^ sxmo_gpsutil.sh details
Zoom + ^ 1 ^ key i Zoom + ^ 1 ^ key i

2
scripts/core/sxmo_gpsutil.sh
Unescape View File

@ -196,7 +196,7 @@ menulocations() {
)" )"
ZOOM=14 ZOOM=14
if [ "$CHOICE" = "Close Menu" ]; then if [ "$CHOICE" = "Close Menu" ]; then
exit 0 exit 0
else else
LATLON="$(printf %b "$CHOICE" | cut -d: -f2- )" LATLON="$(printf %b "$CHOICE" | cut -d: -f2- )"
gpslatlonset "$LATLON $ZOOM" gpslatlonset "$LATLON $ZOOM"

70
scripts/core/sxmo_lisgdstart.sh
Unescape View File

@ -4,39 +4,39 @@ pkill -9 lisgd
if [ -x "$XDG_CONFIG_HOME"/sxmo/hooks/lisgdstart ]; then if [ -x "$XDG_CONFIG_HOME"/sxmo/hooks/lisgdstart ]; then
"$XDG_CONFIG_HOME"/sxmo/hooks/lisgdstart & "$XDG_CONFIG_HOME"/sxmo/hooks/lisgdstart &
else else
#-g format: #-g format:
# fingers,swipe,edge,distance,command # fingers,swipe,edge,distance,command
#order matters, only the first match gets executed #order matters, only the first match gets executed
lisgd "$@" -t 200 \ lisgd "$@" -t 200 \
-g '1,DRUL,BR,*,sxmo_hotcorner.sh bottomright' \ -g '1,DRUL,BR,*,sxmo_hotcorner.sh bottomright' \
-g '1,DLUR,BL,*,sxmo_hotcorner.sh bottomleft' \ -g '1,DLUR,BL,*,sxmo_hotcorner.sh bottomleft' \
-g '1,ULDR,TL,*,sxmo_hotcorner.sh topleft' \ -g '1,ULDR,TL,*,sxmo_hotcorner.sh topleft' \
-g '1,DRUL,TR,*,sxmo_hotcorner.sh topright' \ -g '1,DRUL,TR,*,sxmo_hotcorner.sh topright' \
-g '1,LR,B,L,sxmo_gesturehandler.sh enter' \ -g '1,LR,B,L,sxmo_gesturehandler.sh enter' \
-g '1,RL,B,L,sxmo_gesturehandler.sh back' \ -g '1,RL,B,L,sxmo_gesturehandler.sh back' \
-g '1,LR,L,*,sxmo_gesturehandler.sh prevdesktop' \ -g '1,LR,L,*,sxmo_gesturehandler.sh prevdesktop' \
-g '1,RL,R,*,sxmo_gesturehandler.sh nextdesktop' \ -g '1,RL,R,*,sxmo_gesturehandler.sh nextdesktop' \
-g '1,DU,L,L,sxmo_gesturehandler.sh unmute' \ -g '1,DU,L,L,sxmo_gesturehandler.sh unmute' \
-g '1,UD,L,L,sxmo_gesturehandler.sh mute' \ -g '1,UD,L,L,sxmo_gesturehandler.sh mute' \
-g '1,DU,L,*,sxmo_gesturehandler.sh volup' \ -g '1,DU,L,*,sxmo_gesturehandler.sh volup' \
-g '1,UD,L,*,sxmo_gesturehandler.sh voldown' \ -g '1,UD,L,*,sxmo_gesturehandler.sh voldown' \
-g '1,LR,T,*,sxmo_gesturehandler.sh brightnessup' \ -g '1,LR,T,*,sxmo_gesturehandler.sh brightnessup' \
-g '1,RL,T,*,sxmo_gesturehandler.sh brightnessdown' \ -g '1,RL,T,*,sxmo_gesturehandler.sh brightnessdown' \
-g "1,DU,B,*,sxmo_gesturehandler.sh showkeyboard" \ -g "1,DU,B,*,sxmo_gesturehandler.sh showkeyboard" \
-g "1,UD,B,*,sxmo_gesturehandler.sh hidekeyboard" \ -g "1,UD,B,*,sxmo_gesturehandler.sh hidekeyboard" \
-g "1,UD,T,*,sxmo_gesturehandler.sh showmenu" \ -g "1,UD,T,*,sxmo_gesturehandler.sh showmenu" \
-g "1,DU,T,*,sxmo_gesturehandler.sh hidemenu" \ -g "1,DU,T,*,sxmo_gesturehandler.sh hidemenu" \
-g "2,UD,T,*,sxmo_gesturehandler.sh showsysmenu" \ -g "2,UD,T,*,sxmo_gesturehandler.sh showsysmenu" \
-g "2,UD,B,*,sxmo_gesturehandler.sh killwindow" \ -g "2,UD,B,*,sxmo_gesturehandler.sh killwindow" \
-g '2,RL,*,*,sxmo_gesturehandler.sh moveprevdesktop' \ -g '2,RL,*,*,sxmo_gesturehandler.sh moveprevdesktop' \
-g '2,LR,*,*,sxmo_gesturehandler.sh movenextdesktop' \ -g '2,LR,*,*,sxmo_gesturehandler.sh movenextdesktop' \
-g '1,DU,R,L,sxmo_gesturehandler.sh scrollup_long' \ -g '1,DU,R,L,sxmo_gesturehandler.sh scrollup_long' \
-g '1,UD,R,L,sxmo_gesturehandler.sh scrolldown_long' \ -g '1,UD,R,L,sxmo_gesturehandler.sh scrolldown_long' \
-g '1,DU,R,M,sxmo_gesturehandler.sh scrollup_med' \ -g '1,DU,R,M,sxmo_gesturehandler.sh scrollup_med' \
-g '1,UD,R,M,sxmo_gesturehandler.sh scrolldown_med' \ -g '1,UD,R,M,sxmo_gesturehandler.sh scrolldown_med' \
-g '1,DU,R,S,sxmo_gesturehandler.sh scrollup_short' \ -g '1,DU,R,S,sxmo_gesturehandler.sh scrollup_short' \
-g '1,UD,R,S,sxmo_gesturehandler.sh scrolldown_short' \ -g '1,UD,R,S,sxmo_gesturehandler.sh scrolldown_short' \
-g '1,LR,R,S,sxmo_gesturehandler.sh scrollright_short' \ -g '1,LR,R,S,sxmo_gesturehandler.sh scrollright_short' \
-g '1,RL,L,S,sxmo_gesturehandler.sh scrollleft_short' \ -g '1,RL,L,S,sxmo_gesturehandler.sh scrollleft_short' \
& &
fi fi

2
scripts/core/sxmo_networks.sh
Unescape View File

@ -96,7 +96,7 @@ networksmenu() {
elif [ "$CHOICE" = "Add a GSM Network" ]; then elif [ "$CHOICE" = "Add a GSM Network" ]; then
addnetworkgsmmenu addnetworkgsmmenu
elif [ "$CHOICE" = "Add a WPA Network" ]; then elif [ "$CHOICE" = "Add a WPA Network" ]; then
addnetworkwpamenu addnetworkwpamenu
elif [ "$CHOICE" = "Delete a Network" ]; then elif [ "$CHOICE" = "Delete a Network" ]; then
deletenetworkmenu deletenetworkmenu
elif [ "$CHOICE" = "Launch Nmtui" ]; then elif [ "$CHOICE" = "Launch Nmtui" ]; then

2
scripts/core/sxmo_pipecomplete.sh
Unescape View File

@ -6,7 +6,7 @@ menu() {
pidof "$KEYBOARD" || "$KEYBOARD" & pidof "$KEYBOARD" || "$KEYBOARD" &
RESULT="$( RESULT="$(
printf %b "$( printf %b "$(
echo "Close Menu"; echo "Close Menu";
echo "$INPUT" | grep -Eo '\S+' | tr -d '[:blank:]' | sort | uniq echo "$INPUT" | grep -Eo '\S+' | tr -d '[:blank:]' | sort | uniq
)" | dmenu -p "$PROMPT" -l 10 -i -c -fn Terminus-20 )" | dmenu -p "$PROMPT" -l 10 -i -c -fn Terminus-20
)" )"

4
scripts/core/sxmo_urlhandler.sh
Unescape View File

@ -48,7 +48,7 @@ COMMAND=$(
[ -z "$COMMAND" ] && exit 1 [ -z "$COMMAND" ] && exit 1
RUN=$(echo "$URL" | xargs -IURL echo "$COMMAND") RUN=$(echo "$URL" | xargs -IURL echo "$COMMAND")
if [ "$FORK" = fork ]; then if [ "$FORK" = fork ]; then
st -e sh -c "$RUN" & st -e sh -c "$RUN" &
else else
st -e sh -c "$RUN" st -e sh -c "$RUN"
fi fi

2
scripts/modem/sxmo_modemsendsms.sh
Unescape View File

@ -44,7 +44,7 @@ SMSNO="$(
)" )"
mmcli -s "${SMSNO}" --send || err "Couldn't send text message" mmcli -s "${SMSNO}" --send || err "Couldn't send text message"
for i in $(mmcli -m "$MODEM" --messaging-list-sms | grep " (sent)" | cut -f5 -d' ') ; do for i in $(mmcli -m "$MODEM" --messaging-list-sms | grep " (sent)" | cut -f5 -d' ') ; do
mmcli -m "$MODEM" --messaging-delete-sms="$i" mmcli -m "$MODEM" --messaging-delete-sms="$i"
done done
TIME="$(date --iso-8601=seconds)" TIME="$(date --iso-8601=seconds)"

4
scripts/notifications/sxmo_notificationmonitor.sh
Unescape View File

@ -18,7 +18,7 @@ notificationhook() {
sleep 0.5 sleep 0.5
VIBI=$(echo $VIBI+1 | bc) VIBI=$(echo $VIBI+1 | bc)
done done
fi fi
} }
handlenewnotiffile(){ handlenewnotiffile(){
@ -41,7 +41,7 @@ handlenewnotiffile(){
) & ) &
[ -e "$NOTIFWATCHFILE" ] && ( [ -e "$NOTIFWATCHFILE" ] && (
inotifywait "$NOTIFWATCHFILE" && rm -f "$NOTIFFILE" inotifywait "$NOTIFWATCHFILE" && rm -f "$NOTIFFILE"
) & ) &
fi fi
} }

Write Preview
Loading…
Cancel
Save