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

Use $SHELL, fix after patch: Start terminal with a login shell if run from dmenu

Browse source 
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Maarten van Gompel 2020-11-06 22:35:27 +01:00
parent 8fc92c55d5
commit ce188e2f26
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/core/sxmo_appmenu.sh
View file

@ -70,7 +70,7 @@ programchoicesinit() {
$(command -v ranger >/dev/null && echo 'Ranger ^ 0 ^ st -e ranger') $(command -v ranger >/dev/null && echo 'Ranger ^ 0 ^ st -e ranger')
$(command -v sacc >/dev/null && echo 'Sacc ^ 0 ^ st -e sacc i-logout.cz/1/bongusta') $(command -v sacc >/dev/null && echo 'Sacc ^ 0 ^ st -e sacc i-logout.cz/1/bongusta')
$(command -v sic >/dev/null && echo 'Sic ^ 0 ^ st -e sic') $(command -v sic >/dev/null && echo 'Sic ^ 0 ^ st -e sic')
$(command -v st >/dev/null && echo 'St ^ 0 ^ st -e /bin/sh -l') $(command -v st >/dev/null && echo 'St ^ 0 ^ st -e $SHELL -l')
$(command -v surf >/dev/null && echo 'Surf ^ 0 ^ surf') $(command -v surf >/dev/null && echo 'Surf ^ 0 ^ surf')
$(command -v syncthing >/dev/null && echo 'Syncthing ^ 0 ^ syncthing') $(command -v syncthing >/dev/null && echo 'Syncthing ^ 0 ^ syncthing')
$(command -v telegram-desktop >/dev/null && echo 'Telegram ^ 0 ^ telegram-desktop') $(command -v telegram-desktop >/dev/null && echo 'Telegram ^ 0 ^ telegram-desktop')
@ -96,7 +96,7 @@ programchoicesinit() {
Modem Info ^ 0 ^ sxmo_modeminfo.sh Modem Info ^ 0 ^ sxmo_modeminfo.sh
Modem Log ^ 0 ^ sxmo_modemlog.sh Modem Log ^ 0 ^ sxmo_modemlog.sh
Flash $( Flash $(
grep -qE '^0$' /sys/class/leds/white:flash/brightness && grep -qE '^0$' /sys/class/leds/white:flash/brightness &&
printf %b "Off → On" || printf %b "On → Off"; printf %b "Off → On" || printf %b "On → Off";
printf %b "^ 1 ^ sxmo_flashtoggle.sh" printf %b "^ 1 ^ sxmo_flashtoggle.sh"
) )
@ -420,7 +420,7 @@ quit() {
mainloop() { mainloop() {
getprogchoices "$ARGS" getprogchoices "$ARGS"
echo "$PROGCHOICES" | echo "$PROGCHOICES" |
cut -d'^' -f1 | cut -d'^' -f1 |
dmenu -idx "$DMENUIDX" -l 16 -c -fn "Terminus-30" -p "$WINNAME" | ( dmenu -idx "$DMENUIDX" -l 16 -c -fn "Terminus-30" -p "$WINNAME" | (
PICKED="$(cat)" PICKED="$(cat)"
echo "$PICKED" | grep . || quit echo "$PICKED" | grep . || quit

1
scripts/core/sxmo_xinit.sh
View file

@ -8,6 +8,7 @@ envvars() {
command -v "$TERMCMD" || export TERMCMD=st command -v "$TERMCMD" || export TERMCMD=st
command -v "$BROWSER" || export BROWSER=surf command -v "$BROWSER" || export BROWSER=surf
command -v "$EDITOR" || export EDITOR=vis command -v "$EDITOR" || export EDITOR=vis
command -v "$SHELL" || export SHELL=/bin/sh
command -v "$KEYBOARD" || defaultkeyboard command -v "$KEYBOARD" || defaultkeyboard
[ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv [ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1 [ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1