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

Shellcheck a few core scripts

Browse source
This commit is contained in:
Miles Alan 2020-06-07 10:04:38 -05:00
parent 1c8efb9950
commit 6a432b305b
4 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/core/sxmo_camera.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env sh #!/usr/bin/env sh
err() { err() {
echo -e "$1" | dmenu -fn Terminus-20 -c -l 10 printf %b "$1" | dmenu -fn Terminus-20 -c -l 10
exit 1 exit 1
} }
media-ctl -d /dev/media1 --set-v4l2 '"ov5640 3-004c":0[fmt:UYVY8_2X8/1280x720]' || err "Couldn't open camera, is camera enabled?" media-ctl -d /dev/media1 --set-v4l2 '"ov5640 3-004c":0[fmt:UYVY8_2X8/1280x720]' || err "Couldn't open camera, is camera enabled?"

26
scripts/core/sxmo_rotate.sh
View file

@ -1,31 +1,31 @@
#!/usr/bin/env sh #!/usr/bin/env sh
applyptrmatrix() { applyptrmatrix() {
PTRID="$( PTRID="$(
xinput | grep -iE 'touchscreen.+pointer' | grep -oE 'id=[0-9]+' | cut -d= -f2 xinput | grep -iE 'touchscreen.+pointer' | grep -oE 'id=[0-9]+' | cut -d= -f2
)" )"
xinput set-prop "$PTRID" --type=float --type=float "Coordinate Transformation Matrix" "$@" xinput set-prop "$PTRID" --type=float --type=float "Coordinate Transformation Matrix" "$@"
} }
isrotated() { isrotated() {
xrandr | grep primary | cut -d' ' -f 5 | grep right && return 0 xrandr | grep primary | cut -d' ' -f 5 | grep right && return 0
return 1 return 1
} }
rotnormal() { rotnormal() {
xrandr -o normal xrandr -o normal
applyptrmatrix 0 0 0 0 0 0 0 0 0 applyptrmatrix 0 0 0 0 0 0 0 0 0
exit 0 exit 0
} }
rotright() { rotright() {
xrandr -o right xrandr -o right
applyptrmatrix 0 1 0 -1 0 1 0 0 1 applyptrmatrix 0 1 0 -1 0 1 0 0 1
exit 0 exit 0
} }
rotate() { rotate() {
isrotated && rotnormal || rotright if isrotated; then rotnormal; else rotright; fi
} }
rotate rotate

30
scripts/core/sxmo_vol.sh
View file

@ -1,26 +1,26 @@
#!/usr/bin/env sh #!/usr/bin/env sh
notify() { notify() {
VOL="$( VOL="$(
amixer get "$(sxmo_audiocurrentdevice.sh)" | amixer get "$(sxmo_audiocurrentdevice.sh)" |
grep -oE '([0-9]+)%' | grep -oE '([0-9]+)%' |
tr -d ' %' | tr -d ' %' |
awk '{ s += $1; c++ } END { print s/c }' | awk '{ s += $1; c++ } END { print s/c }' |
xargs printf %.0f xargs printf %.0f
)" )"
dunstify -i 0 -u normal -r 998 "♫ $VOL" dunstify -i 0 -u normal -r 998 "♫ $VOL"
echo 1 > /tmp/sxmo_bar echo 1 > /tmp/sxmo_bar
} }
up() { up() {
amixer set "$(sxmo_audiocurrentdevice.sh)" 1+ amixer set "$(sxmo_audiocurrentdevice.sh)" 1+
notify notify
} }
down() { down() {
amixer set "$(sxmo_audiocurrentdevice.sh)" 1- amixer set "$(sxmo_audiocurrentdevice.sh)" 1-
notify notify
} }
setvol() { setvol() {
amixer set "$(sxmo_audiocurrentdevice.sh)" $1 amixer set "$(sxmo_audiocurrentdevice.sh)" "$1"
} }
$@ $1

21
scripts/core/sxmo_xinit.sh
View file

@ -1,8 +1,8 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# Env vars # Env vars
source /etc/profile . /etc/profile
which $TERM || export TERM=st which "$TERM" || export TERM=st
which $BROWSER || export BROWSER=surf which "$BROWSER" || export BROWSER=surf
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1 [ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config
@ -24,16 +24,9 @@ autocutsel &
autocutsel -selection PRIMARY & autocutsel -selection PRIMARY &
sxmo_statusbar.sh & sxmo_statusbar.sh &
# Start dunst, lisgd (after dunst so it's in dbus path) and dwm # Startup dbus, dunst in dbus path, lisgd in dbus path, and finally dwm
LEGACYSXMOFOLDERWARNING="
Warning: ~/.sxmo is deprecated since sxmo-utils 1.1.5.
Modem call logs/texts location have moved.
Please move the contents of the ~/.sxmo/ folder to $XDG_CONFIG_HOME/sxmo/modem/
"
exec dbus-run-session sh -c " exec dbus-run-session sh -c "
dunst -conf /usr/share/sxmo/dunst.conf & dunst -conf /usr/share/sxmo/dunst.conf &
lisgd & lisgd &
[ -d "/home/$USER/.sxmo" ] && notify-send -t 0 -u critical '$LEGACYSXMOFOLDERWARNING' & dwm 2> ~/.dwm.log
dwm 2> ~/.dwm.log
" "