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

In sxmo_appmenu.sh & sxmo_urlhandler.sh only show entries if program installed

Browse source 
E.g. so if you don't have firefox installed it won't show up in menus
This commit is contained in:
Miles Alan 2020-08-05 19:45:32 -05:00
parent 4362eacde2
commit a203bbfe85
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/core/sxmo_appmenu.sh
View file

@ -35,14 +35,14 @@ programchoicesinit() {
elif echo "$WMCLASS" | grep -i "applications"; then elif echo "$WMCLASS" | grep -i "applications"; then
# Apps menu # Apps menu
CHOICES=" CHOICES="
Surf ^ 0 ^ surf $(command -v surf >/dev/null && echo 'Surf ^ 0 ^ surf')
Netsurf ^ 0 ^ netsurf $(command -v netsurf >/dev/null && echo 'Netsurf ^ 0 ^ netsurf')
Firefox ^ 0 ^ firefox $(command -v firefox >/dev/null && echo 'Firefox ^ 0 ^ firefox')
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')
W3m ^ 0 ^ st -e w3m duck.com $(command -v w3m >/dev/null && echo 'W3m ^ 0 ^ st -e w3m duck.com')
Xcalc ^ 0 ^ xcalc $(command -v xcalc >/dev/null && echo 'Xcalc ^ 0 ^ xcalc')
St ^ 0 ^ st $(command -v st >/dev/null && echo 'St ^ 0 ^ st')
Foxtrotgps ^ 0 ^ foxtrotgps $(command -v foxtrotgps >/dev/null && echo 'Foxtrotgps ^ 0 ^ foxtrotgps')
" "
WINNAME=Apps WINNAME=Apps
elif echo "$WMCLASS" | grep -i "config"; then elif echo "$WMCLASS" | grep -i "config"; then
@ -320,7 +320,7 @@ programchoicesinit() {
Scripts ^ 0 ^ sxmo_appmenu.sh scripts Scripts ^ 0 ^ sxmo_appmenu.sh scripts
Apps ^ 0 ^ sxmo_appmenu.sh applications Apps ^ 0 ^ sxmo_appmenu.sh applications
Files ^ 0 ^ sxmo_files.sh Files ^ 0 ^ sxmo_files.sh
Maps ^ 0 ^ foxtrotgps $(command -v foxtrotgps >/dev/null && echo 'Maps ^ 0 ^ foxtrotgps')
Dialer ^ 0 ^ sxmo_modemdial.sh Dialer ^ 0 ^ sxmo_modemdial.sh
Texts ^ 0 ^ sxmo_modemtext.sh Texts ^ 0 ^ sxmo_modemtext.sh
Camera ^ 0 ^ sxmo_camera.sh Camera ^ 0 ^ sxmo_camera.sh

30
scripts/core/sxmo_urlhandler.sh
View file

@ -24,19 +24,23 @@ fi
COMMAND=$( COMMAND=$(
echo " echo "
w3m URL $(command -v w3m >/dev/null && echo 'w3m URL')
mpv -ao=alsa -v URL $(command -v mpv >/dev/null && echo 'mpv -ao=alsa -v URL')
mpv -ao=alsa -v --ytdl-format='[height<420]' URL $(command -v mpv >/dev/null && echo 'mpv -ao=alsa -v --ytdl-format='[height<420]' URL')
firefox -new-window URL $(command -v firefox >/dev/null && echo 'firefox -new-window URL')
netsurf URL $(command -v netsurf >/dev/null && echo 'netsurf URL')
surf URL $(command -v surf >/dev/null && echo 'surf URL')
echo URL | xsel -i $(command -v echo >/dev/null && echo 'echo URL | xsel -i')
youtube-dl -o- URL | mpv -ao=alsa -v - $(command -v youtube-dl >/dev/null && echo 'youtube-dl -o- URL | mpv -ao=alsa -v -')
youtube-dl URL $(command -v youtube-dl >/dev/null && echo 'youtube-dl URL')
curl URL | vis - $(command -v curl >/dev/null && echo 'curl URL | vis -')
wget URL $(command -v wget >/dev/null && echo 'wget URL')
aria2c URL $(command -v aria2c >/dev/null && echo 'aria2c URL')
" | sed "s/URL/'URL'/g" | sed -e '/^\s*$/d' | sed -e 's/^\s*//' | dmenu -fn Terminus-15 -p "Pipe URL" -c -l 20 " |
sed "s/URL/'URL'/g" |
sed -e '/^\s*$/d' |
sed -e 's/^\s*//' |
dmenu -fn Terminus-15 -p "Pipe URL" -c -l 20
) )
[ -z "$COMMAND" ] && exit 1 [ -z "$COMMAND" ] && exit 1