Briq
/
linux-live
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smarter recognition if app requires terminal or not

pull/63/head
TomasM 2018-11-23 15:48:29 +00:00
parent 0cb17f9c67
commit c186696b93
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Slax/debian/modules/03-desktop/build
View File

@ -64,10 +64,10 @@ cp debian/$NAME/usr/bin/fluxbox /squashfs-root/usr/bin
# add xlunch from sources
wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v4.0.1.tar.gz
wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v4.1.0.tar.gz
cd /tmp
tar -xf xlunch.tar.gz
cd xlunch-4.0.1
cd xlunch-4.1.0
make
cp xlunch /squashfs-root/usr/bin
cp extra/gentriesquick /squashfs-root/usr/bin/xlunch_genquick

12
Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect
View File

@ -1,11 +1,11 @@
#!/bin/bash
COMMAND=$(
xlunch_genquick 64 | \
xlunch_genquick 64 --desktop | \
xlunch --border 7% --sideborder 10% --borderratio 100 --sideborderratio 50 \
--background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
--voidclickterminate --iconpadding 40 --textpadding 10 \
--paddingswap --leastmargin 6 --hidemissing --iconsize 64 \
--leastmargin 6 --hidemissing --iconsize 64 \
--highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \
--outputonly
)
@ -16,6 +16,12 @@ fi
fbstartupnotify
# if command is a .desktop file, parse it
if [[ "$COMMAND" =~ \.desktop ]]; then
NoTerm="$(cat "$COMMAND" | grep Terminal\\s*= | grep -i "Terminal\\s*=\\s*false")"
COMMAND="$(cat "$COMMAND" | grep Exec\\s*= | sed -r s/.*=// | sed -r "s/\\s.*//")"
fi
cmd="$(echo $COMMAND | sed -r "s/\\s.*//")"
whi="$(which $cmd | head -n 1)"
Xdep=$(ldd $whi | grep libX11)
@ -26,7 +32,7 @@ if [ "$Ndep" != "" -o "$cmd" = "man" -o "$cmd" = "mc" ]; then
WAIT=""
fi
if [ "$Xdep" = "" -a "$cmd" != "chromium" -a "$cmd" != "wicd-manager" -a "$cmd" != "fbliveapp" ]; then
if [ "$Xdep" = "" -a "$cmd" != "chromium" -a "$cmd" != "wicd-manager" -a "$cmd" != "fbliveapp" -a "$NoTerm" = "" ]; then
exec xterm -ls -e bash --login -c -- "echo $USER@$HOSTNAME:$PWD# '$COMMAND'; $COMMAND; $WAIT"
else
exec $COMMAND

2
Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout
View File

@ -4,7 +4,7 @@ COMMAND=$(
xlunch --input /etc/xlunch/logout.dsv --noprompt --border auto --sideborder auto --columns 3 --rows 1 \
--background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
--voidclickterminate --iconpadding 30 --textpadding 10 \
--paddingswap --leastmargin 10 --hidemissing --iconsize 128 \
--leastmargin 10 --hidemissing --iconsize 128 \
--highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \
--outputonly
)