slitaz-tools rev 978
tazbox su: remove dbus-launch. tazx,terminal: tiny fixes
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Mon May 23 23:25:04 2016 +0300 (2016-05-23) |
parents | bb7be0ca546f |
children | 928b4d1e7a97 |
files | tazbox/tazbox tinyutils/tazx tinyutils/terminal |
line diff
1.1 --- a/tazbox/tazbox Sat May 21 17:36:09 2016 +0200 1.2 +++ b/tazbox/tazbox Mon May 23 23:25:04 2016 +0300 1.3 @@ -676,7 +676,7 @@ 1.4 fi 1.5 1.6 # Try to login & execute. If password is wrong execute error dialog 1.7 - SU_CMD_QUOTED="$(echo "dbus-launch --exit-with-session $SU_CMD" | sed 's|&|\\&|g')" 1.8 + SU_CMD_QUOTED="$(echo "$SU_CMD" | sed 's|&|\\&|g')" 1.9 echo $main | cut -d"|" -f1 | su -c "$SU_CMD_QUOTED &" || su_error 1.10 ;; 1.11
2.1 --- a/tinyutils/tazx Sat May 21 17:36:09 2016 +0200 2.2 +++ b/tinyutils/tazx Mon May 23 23:25:04 2016 +0300 2.3 @@ -311,6 +311,7 @@ 2.4 "\n\Z1$(_n 'Failed to setup driver')\Zn $(_ '(unknown hardware)')" 7 68 ;; 2.5 esac 2.6 [ -n "$d" ] && inst_pkg xorg-xf86-video-$d 2.7 + [ -n "$d" ] && inst_pkg mesa-dri-$d 2.8 done 2.9 } 2.10 2.11 @@ -337,7 +338,7 @@ 2.12 2.13 exec 3>&1 2.14 2.15 - app=$($DIALOG --clear --colors --backtitle "$msg" \ 2.16 + app=$($DIALOG --clear --colors --backtitle "$msg" --ok-label " $(_n 'Install')..." \ 2.17 --title "{\Z3 $(_n 'Install Window Manager and applications') \Zn}" \ 2.18 --inputmenu "" 21 52 18 \ 2.19 $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do 2.20 @@ -398,8 +399,8 @@ 2.21 spacefm thunar xfe ytree" 2.22 2.23 BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \ 2.24 -links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb \ 2.25 -w3m xombrero" 2.26 +links lynx midori netsurf opera palemoon QtWeb qupzilla retawq seamonkey surf \ 2.27 +tazweb w3m xombrero" 2.28 2.29 EDITORS="adie beaver bluefish emacs geany jed joe juffed ht le leafpad \ 2.30 mcedit mousepad mp-5 nano qedit SciTE tea vi vim xedit xfw zile" 2.31 @@ -556,6 +557,7 @@ 2.32 32 truecolor 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3) 2.33 dialog_end ;; 2.34 esac 2.35 + (grep -q 'DefaultDepth' ${xorg_config}/70-Screen.conf) || \ 2.36 sed 's|Monitor.*"$|&\n\tDefaultDepth '$colors'|' -i ${xorg_config}/70-Screen.conf 2.37 } 2.38
3.1 --- a/tinyutils/terminal Sat May 21 17:36:09 2016 +0200 3.2 +++ b/tinyutils/terminal Mon May 23 23:25:04 2016 +0300 3.3 @@ -33,6 +33,7 @@ 3.4 3.5 case $TERMINAL in 3.6 sakura) 3.7 + (grep -q 'Unloading fbdev' /var/log/Xorg.0.log) || TERMINAL="sakura --sync" 3.8 OPT_TITLE='-t'; OPT_GEOM='--geometry'; OPT_HELP='-?'; OPT_HOLD='-h';; 3.9 xterm|*) 3.10 OPT_TITLE='-T'; OPT_GEOM='-geometry'; OPT_HELP='-help'; OPT_HOLD='-hold';;