slitaz-tools rev 908
text-mode default apps: detect $XAUTHORITY and run "terminal -e" ; tazbox: add qupzilla, mcedit and others
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Thu Oct 02 21:13:05 2014 +0000 (2014-10-02) |
parents | dc9b25be267b |
children | f582b09fa62b |
files | tazbox/tazbox tinyutils/browser tinyutils/editor tinyutils/file-manager |
line diff
1.1 --- a/tazbox/tazbox Fri Sep 26 14:48:14 2014 +0000 1.2 +++ b/tazbox/tazbox Thu Oct 02 21:13:05 2014 +0000 1.3 @@ -642,19 +642,20 @@ 1.4 . $CONFIG 1.5 1.6 FILE_MANAGERS=$(gen_alt $FILE_MANAGER \ 1.7 - clex emelfm2 mc pathfinder pcmanfm ranger spacefm thunar xfe ytree) 1.8 + clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger spacefm \ 1.9 + thunar xfe ytree) 1.10 BROWSERS=$(gen_alt $BROWSER \ 1.11 arora chrome cream dillo elinks firefox iron links lynx midori \ 1.12 - netsurf opera retawq seamonkey surf tazweb) 1.13 + netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb) 1.14 EDITORS=$(gen_alt $EDITOR \ 1.15 - adie beaver emacs geany jed joe le leafpad mousepad mp-5 nano \ 1.16 - SciTE vi vim xedit xfw zile) 1.17 + adie beaver emacs geany jed joe juffed ht le leafpad mcedit \ 1.18 + mousepad mp-5 nano qedit SciTE vi vim xedit xfw zile) 1.19 TERMINALS=$(gen_alt $TERMINAL \ 1.20 - aterm evilvte lxterminal mrxvt sakura stjerm tilda urxvt vte xterm \ 1.21 - yeahconsole) 1.22 + aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda urxvt vte \ 1.23 + xterm yeahconsole) 1.24 WINDOW_MANAGERS=$(gen_alt $WINDOW_MANAGER \ 1.25 - awesome blackbox dwm echinus enlightenment fluxbox icewm jwm \ 1.26 - karmen matchbox openbox-session pekwm ratpoison xfwm4) 1.27 + awesome blackbox dwm echinus enlightenment fluxbox icewm icewm-session jwm \ 1.28 + karmen lxqt matchbox openbox-session pekwm ratpoison xfwm4) 1.29 1.30 icon=preferences-desktop-default-applications 1.31 eval $(yad --title="$(_n 'SliTaz default applications')" \
2.1 --- a/tinyutils/browser Fri Sep 26 14:48:14 2014 +0000 2.2 +++ b/tinyutils/browser Thu Oct 02 21:13:05 2014 +0000 2.3 @@ -8,11 +8,18 @@ 2.4 2.5 EXEC="exec setsid $BROWSER" 2.6 2.7 +if [ ! -z $XAUTHORITY ]; then 2.8 + EXECT="terminal -e $BROWSER"; 2.9 + case $BROWSER in links) EXECT="$EXEC -g" ;; esac 2.10 +else 2.11 + EXECT="$BROWSER"; 2.12 +fi 2.13 + 2.14 case $BROWSER in 2.15 - *links*|lynx) 2.16 - $EXEC $@ ;; 2.17 - w3m) $EXEC -N $@ ;; 2.18 - *) $EXEC $@ & ;; 2.19 + *links*|retawq|lynx) 2.20 + $EXECT $@ ;; 2.21 + w3m) $EXECT -N $@ ;; 2.22 + *) $EXEC $@ ;; 2.23 esac 2.24 2.25 exit 0
3.1 --- a/tinyutils/editor Fri Sep 26 14:48:14 2014 +0000 3.2 +++ b/tinyutils/editor Thu Oct 02 21:13:05 2014 +0000 3.3 @@ -6,6 +6,15 @@ 3.4 USER_CONFIG="$HOME/.config/slitaz/applications.conf" 3.5 [ -f $USER_CONFIG ] && . $USER_CONFIG 3.6 3.7 -exec setsid $EDITOR $@ 3.8 +if [ ! -z $XAUTHORITY ]; then 3.9 + EXEC="terminal -e $EDITOR"; 3.10 +else EXEC="$EDITOR"; 3.11 +fi 3.12 + 3.13 +case $EDITOR in 3.14 + emacs|joe|jed|ht|le|nano|vi*) $EXEC $@ ;; 3.15 + mcedit) $EXEC -a -S nicedark $@ ;; 3.16 + *) exec setsid $EDITOR $@ ;; 3.17 +esac 3.18 3.19 exit 0
4.1 --- a/tinyutils/file-manager Fri Sep 26 14:48:14 2014 +0000 4.2 +++ b/tinyutils/file-manager Thu Oct 02 21:13:05 2014 +0000 4.3 @@ -6,6 +6,16 @@ 4.4 USER_CONFIG="$HOME/.config/slitaz/applications.conf" 4.5 [ -f $USER_CONFIG ] && . $USER_CONFIG 4.6 4.7 -exec setsid $FILE_MANAGER $@ & 4.8 +if [ ! -z $XAUTHORITY ]; then 4.9 + EXEC="terminal -e $FILE_MANAGER" ; 4.10 +else EXEC="$FILE_MANAGER" ; 4.11 +fi 4.12 + 4.13 +case $FILE_MANAGER in 4.14 + clex) $EXEC ;; 4.15 + ytree) $EXEC $@ ;; 4.16 + mc) $EXEC -S gotar -d $@ ;; 4.17 + *) exec setsid $FILE_MANAGER $@ ;; 4.18 +esac 4.19 4.20 exit 0