slitaz-tools annotate tinyutils/tazx @ rev 912

tazx: add default applications dialog, replace lists from tazbox.
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Wed Nov 05 19:01:28 2014 +0200 (2014-11-05)
parents f582b09fa62b
children 5bb075010572
rev   line source
pankso@4 1 #!/bin/sh
pankso@4 2 #
pankso@66 3 # Tazx - Ncurses X configuration for SliTaz GNU/Linux using Dialog boxes.
paul@835 4 # This tinyutil is part of slitaz-tools. Tazx can configure Xorg with
pankso@626 5 # several Window Managers. The GTK interface to configure X is in tazbox.
pankso@4 6 #
pascal@821 7 # (c) 2011-2014 SliTaz GNU/Linux - GNU GPL v3.
pankso@209 8 # Authors: Christophe Lincoln <pankso@slitaz.org>
pankso@209 9 # Pascal Bellard <pascal.bellard@slitaz.org>
pankso@4 10 #
pankso@837 11
paul@838 12 # 20140317: most xsession, xinitrc are obsolete, provided system files
pankso@840 13 # are in /etc/skel and WM config files should no longer be copied by
pankso@840 14 # tazx to user home. If some configs are needed by WMs they should
pankso@840 15 # be set by a /usr/bin/wmname-session script I guess. - Pankso
pankso@837 16
al@813 17 . /lib/libtaz.sh
al@813 18 . /etc/slitaz/slitaz.conf
pankso@840 19 . /etc/slitaz/applications.conf
pankso@840 20
pankso@840 21 installed="$PKGS_DB/installed"
pankso@840 22
al@813 23 export TEXTDOMAIN='slitaz-tools' #i18n
pankso@626 24 : ${DIALOG=dialog}
pankso@4 25
pankso@535 26 # Default value.
pankso@840 27 WM=${WINDOW_MANAGER}
pankso@351 28
pankso@534 29 # Default user for config files in Live mode, id is 1000 since it is
pankso@534 30 # created by /etc/init.d/bootopts.sh.
pankso@626 31 USER=$(cat /etc/passwd | grep 1000 | cut -d ":" -f 1)
pankso@4 32
pankso@628 33 #
pankso@615 34 # Functions
pankso@628 35 #
pankso@615 36
al@813 37 # Save chunk of xorg.conf into specified file
al@813 38 save_chunk() {
al@813 39 sed -e '/Section "'${1#*-}'"/,/EndSection/!d' \
al@813 40 -e "s/EndSection/EndSection\n/" $xorg_template > \
al@813 41 $xorg_config/$1.conf
pankso@615 42 }
pankso@66 43
pankso@871 44 gen_xorg_conf_file() {
pankso@871 45 # Create a xorg.conf if needed.
pankso@871 46 if [ ! -f /etc/X11/xorg.conf ]; then
pankso@871 47 cat > /etc/X11/xorg.conf << EOT
pankso@871 48 # You can put here your own Xorg configurations. This config file is read
pankso@871 49 # before all files in /etc/X11/xorg.conf.d and will NOT be erased by any
pankso@871 50 # updates.
pankso@871 51 EOT
pankso@871 52 fi
pankso@871 53 }
pankso@871 54
pankso@870 55 # Generate or regenerate 40-Keyboard.conf
pankso@870 56 keyboard_conf() {
gokhlayeh@492 57 # Configure the keyboard with the right keymap.
al@813 58 keymap=$(cat /etc/keymap.conf)
pankso@874 59 keyboard_config="/etc/X11/xorg.conf.d/40-Keyboard.conf"
al@779 60 variant=""
al@779 61 # this XkbOption moved from 40-evdev.conf (xorg-xf86-input-evdev)
al@779 62 options="terminate:ctrl_alt_bksp"
pankso@874 63 gettext "Creating:"; echo -n " $keyboard_config"
pankso@874 64 mkdir -p $(dirname $keyboard_config)
pankso@874 65 case "$keymap" in
pankso@260 66 fr_CH-latin1)
pankso@260 67 # Swiss FrenCH
al@779 68 layout="ch"; variant="fr" ;;
pankso@597 69 uk)
paul@617 70 # English UK
al@779 71 layout="gb" ;;
pankso@260 72 ru)
pankso@260 73 # Russian
al@779 74 layout="us,ru"
al@779 75 options="grp:ctrl_shift_toggle, grp_led:scroll, $options" ;;
al@813 76 ua)
al@813 77 # Ukrainian
al@813 78 layout="us,ua,ru"
al@813 79 options="grp:ctrl_shift_toggle, $options" ;;
pankso@303 80 slovene)
pankso@303 81 # Slovenian
al@779 82 layout="si"; options="grp:alt_shift_toggle, $options" ;;
pankso@577 83 us-acentos)
al@779 84 layout="us"; variant="intl" ;;
pankso@260 85 *)
pankso@260 86 # Use clean /etc/keymap.conf value.
gokhlayeh@492 87 keymap=${keymap%-latin1}
gokhlayeh@492 88 keymap=${keymap%-lat2}
gokhlayeh@492 89 keymap=${keymap%-lat6}
al@779 90 layout=${keymap%-abnt2}
pankso@260 91 esac
al@779 92 cat > $keyboard_config << EOC
al@779 93 Section "InputClass"
al@779 94 Identifier "Keyboard Defaults"
al@779 95 MatchIsKeyboard "yes"
al@779 96 Option "XkbLayout" "$layout"
al@779 97 Option "XkbVariant" "$variant"
al@779 98 Option "XkbOptions" "$options"
al@779 99 EndSection
al@779 100 EOC
pankso@874 101 status
pankso@874 102 [ x$variant == x ] && sed -i '/XkbVariant/d' ${keyboard_config}
pankso@870 103 }
pankso@870 104
pankso@870 105 # Populate xorg.conf.d.
pankso@870 106 xorg_conf_d() {
pankso@870 107 # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d)
pankso@870 108 xorg_config=/etc/X11/xorg.conf.d
pankso@870 109
pankso@870 110 # Define the xorg.conf.new place.
pankso@870 111 xorg_template=/root/xorg.conf.new
pankso@870 112
pankso@870 113 # Obtain a default configuration file from Xorg.
pankso@870 114 Xorg -configure :2
pankso@870 115
pankso@870 116 # Backup existing config.
pankso@870 117 tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null
pankso@870 118
pankso@870 119 # Put the different sections in separate files in the config directory.
pankso@870 120 save_chunk 10-ServerLayout
pankso@870 121 sed -i '/Core/d' $xorg_config/10-ServerLayout.conf
pankso@870 122 save_chunk 20-Files
pankso@870 123 save_chunk 30-Module
pankso@870 124 save_chunk 50-Monitor
pankso@870 125 save_chunk 60-Device
pankso@870 126 save_chunk 70-Screen
pankso@870 127
pankso@870 128 # Remove the template.
pankso@870 129 rm $xorg_template
pankso@870 130
pankso@871 131 # Keyboard & xorg.conf
pankso@870 132 keyboard_conf
pankso@871 133 gen_xorg_conf_file
pankso@260 134 }
pankso@260 135
psychomaniak@912 136 dialog_end() {
psychomaniak@912 137 retval=$?
psychomaniak@912 138 exec 3>&-
psychomaniak@912 139 # Continue or exit.
psychomaniak@912 140 case $retval in
psychomaniak@912 141 0) continue ;;
psychomaniak@912 142 1|255) exit 0 ;;
psychomaniak@912 143 esac
psychomaniak@912 144 }
psychomaniak@912 145
paul@549 146 # Install xorg server.
al@813 147 install_xorg() {
pankso@628 148 [ -f "/var/lib/tazpkg/packages.list" ] || tazpkg recharge
pankso@117 149 exec 3>&1
al@813 150 value=$($DIALOG \
al@813 151 --clear --colors \
al@813 152 --title " $(_n 'Install Xorg') " \
al@813 153 --menu "$(_n 'Tazx helps you to select your X driver.')" 16 70 8 \
pankso@635 154 $(fgrep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | \
al@813 155 while read x; do echo $x; _ 'driver'; done) \
al@813 156 "quit" "$(_n 'Quit')" \
al@813 157 2>&1 1>&3)
psychomaniak@912 158 dialog_end
al@813 159
pankso@117 160 # Set selected value.
pankso@117 161 case $value in
pankso@628 162 quit) exit 0 ;;
pankso@117 163 *)
psychomaniak@912 164 inst_pkg xorg-server
psychomaniak@912 165 inst_pkg xorg-xf86-video-$value
pankso@628 166 xorg_conf_d ;;
pankso@117 167 esac
pankso@117 168 }
pankso@117 169
psychomaniak@912 170 inst_pkg() {
psychomaniak@912 171 CMD="sudo tazpkg -gi $@"
psychomaniak@912 172 test $(id -u) = 0 && CMD="tazpkg -gi $@"
psychomaniak@912 173 [ -d "$installed/$@" ] || $CMD
psychomaniak@909 174 }
psychomaniak@909 175
psychomaniak@912 176 apps_dialog() {
psychomaniak@912 177 . ${user_conf}
psychomaniak@912 178 exec 3>&1
psychomaniak@912 179 app=$($DIALOG --clear --colors \
psychomaniak@912 180 --extra-label "$(_n 'Edit')" \
psychomaniak@912 181 --backtitle "{ $(_n '\Z3SliTaz applications config\Zn') }" \
psychomaniak@912 182 --inputmenu " " 22 52 18 WINDOW_MANAGER $WINDOW_MANAGER \
psychomaniak@912 183 $(for a in EDITOR BROWSER TERMINAL FILE_MANAGER; do
psychomaniak@912 184 eval n=$"$a" ; echo "$a $n";
psychomaniak@912 185 done) 2>&1 1>&3)
psychomaniak@912 186 dialog_end
psychomaniak@912 187 case $app in
psychomaniak@912 188 RENAMED*)
psychomaniak@912 189 appname=$(echo $app | cut -d " " -f3)
psychomaniak@912 190 app=$(echo $app | cut -d " " -f2) ;;
psychomaniak@912 191 *)
psychomaniak@912 192 app_name_dialog only-installed d a-item ;;
psychomaniak@912 193 esac
psychomaniak@912 194 if [ ! $appname = " " ]; then
psychomaniak@912 195 [ ! $appname = show_ALL ] || app_name_dialog full-list d
psychomaniak@912 196 if [ ! $(busybox which ${appname} 2>/dev/null) ]; then
psychomaniak@912 197 inst_pkg $appname
psychomaniak@912 198 if [ ! -d "$installed/$appname" ]; then
psychomaniak@912 199 pknm=$(tazpkg search-pkgname /bin/$appname \
psychomaniak@912 200 | grep -Ev '=|:| |/bin/')
psychomaniak@912 201 inst_pkg $pknm
psychomaniak@912 202 fi
psychomaniak@912 203 else
psychomaniak@912 204 sed '/'${app}'/s|=.*$|="'${appname}'"|' -i ${user_conf}
psychomaniak@912 205 fi
psychomaniak@912 206 fi
psychomaniak@912 207 apps_dialog
psychomaniak@912 208 }
psychomaniak@912 209
psychomaniak@912 210 app_name_dialog() {
psychomaniak@912 211 bt="" sz=28 ; [ $1 = full-list ] || sz=20 \
psychomaniak@912 212 bt=$(_n 'select "Show_ALL" to install additional programs')
psychomaniak@912 213 exec 3>&1
psychomaniak@912 214 appname=$($DIALOG --clear --colors \
psychomaniak@912 215 --backtitle "\Z1${bt}\Zn" --title "${app}" \
psychomaniak@912 216 --menu "" $sz 50 24 $(gen_applist $app $@) 2>&1 1>&3) \
psychomaniak@912 217 dialog_end
psychomaniak@912 218 }
psychomaniak@912 219
psychomaniak@912 220 gen_applist() {
psychomaniak@912 221 . ${user_conf}
psychomaniak@912 222 FILE_MANAGERS=" clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger spacefm thunar xfe ytree"
psychomaniak@912 223 BROWSERS=" arora chrome cream dillo elinks firefox iron links lynx midori netsurf \
psychomaniak@912 224 opera QtWeb qupzilla retawq seamonkey surf tazweb"
psychomaniak@912 225 EDITORS=" adie beaver emacs geany jed joe juffed ht le leafpad mcedit mousepad mp-5 \
psychomaniak@912 226 nano qedit SciTE vi vim xedit xfw zile"
psychomaniak@912 227 TERMINALS=" aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda urxvt vte \
psychomaniak@912 228 xterm yeahconsole"
psychomaniak@912 229 WINDOW_MANAGERS=" awesome blackbox dwm echinus enlightenment fluxbox icewm-session jwm \
psychomaniak@912 230 lxde-session karmen matchbox openbox-session pekwm ratpoison startlxqt xfwm4"
psychomaniak@912 231
psychomaniak@912 232 eval list='$'"$1"S
psychomaniak@912 233 eval current='$'"$1"
psychomaniak@912 234 for i in $current $(echo $list" " | sed "s| "$current" | |g") $4 ; do
psychomaniak@912 235 t="<--" ; [ $(busybox which $i 2>/dev/null) ] || t=---
psychomaniak@912 236 if [ $2 = only-installed ] && [ $t = --- ]; then
psychomaniak@912 237 case $i in
psychomaniak@912 238 a-item) i=show_ALL t=$(_n 'Get more apps') ;;
psychomaniak@912 239 *) i=" " t=" " ;; esac
psychomaniak@912 240 fi
psychomaniak@912 241 instmsg=$(_n 'install')
psychomaniak@912 242 t=$(echo $t | sed "s|---|$instmsg|g ; s| |_|g")
psychomaniak@912 243 echo "$i"
psychomaniak@912 244 [ $3 = yad ] || echo -e "$t"
psychomaniak@912 245 done
psychomaniak@912 246 }
psychomaniak@912 247
psychomaniak@912 248 # Screen configuration dialog.
al@813 249 config_dialog() {
psychomaniak@909 250 . /etc/rcS.conf ; LM="ON"
psychomaniak@909 251 [ $LOGIN_MANAGER = "slim" ] || LM="OFF"
psychomaniak@909 252
pankso@66 253 exec 3>&1
al@813 254 value=$($DIALOG \
pankso@535 255 --clear --colors \
pankso@840 256 --title "{ $(_n 'SliTaz Xorg config') }" \
pankso@840 257 --menu "" 16 72 10 \
pankso@840 258 "xorg" "$(_n 'Install or reconfigure Xorg')" \
pankso@840 259 "xorg-light" "$(_n 'Install Xorg server (light version)')" \
psychomaniak@909 260 "onboot" "$(_n 'AutoStart Xorg by SLiM on boot') ...| $LM" \
psychomaniak@909 261 "slim" "$(_n '(Re)Start Simple Login Manager now')" \
psychomaniak@912 262 "wm_apps" "$(_n 'Select & install WM|DE + applications')" \
pankso@840 263 "quit" "$(_n 'Quit Tazx utility')" \
al@813 264 2>&1 1>&3)
psychomaniak@912 265 dialog_end
pankso@66 266 # Set selected value.
pankso@840 267 case "$value" in
psychomaniak@912 268 xorg)
pankso@339 269 install_xorg ;;
pankso@840 270 xorg-light)
psychomaniak@912 271 inst_pkg xorg-server-light
psychomaniak@912 272 inst_pkg xorg-xf86-video-fbdev
pankso@840 273 xorg_conf_d ;;
psychomaniak@909 274 onboot)
psychomaniak@912 275 inst_pkg slim ; inst_pkg dbus
psychomaniak@909 276 if [ $LM = "OFF" ] ; then
psychomaniak@909 277 LM=slim
psychomaniak@912 278 else LM=""
psychomaniak@909 279 fi
psychomaniak@912 280 sed '/LOGIN_MANAGER/s|=.*$|="'$LM'"|' -i /etc/rcS.conf
psychomaniak@909 281 [ $LM = "slim" ] || LM=disabled
psychomaniak@909 282 echo "start X on boot:" $(boldify $LM) ;;
psychomaniak@909 283 slim)
psychomaniak@912 284 inst_pkg slim ; inst_pkg dbus
psychomaniak@912 285 [ ! -z $XAUTHORITY ] || stopd slim ;sleep 2; startd slim ;;
psychomaniak@912 286 wm_apps)
psychomaniak@912 287 slitaz_apps_conf
psychomaniak@912 288 . ${user_conf}
psychomaniak@912 289 apps_dialog ;;
pankso@840 290 *)
pankso@840 291 exit 0 ;;
pankso@66 292 esac
pankso@66 293 }
pankso@4 294
pankso@870 295 # ~/.config/slitaz/applications.conf: Missing = failed to login
pankso@876 296 # Make users applications.conf in /etc/skel so new added user will get
pankso@876 297 # a working X session. Note --> flavors can have a custom config in
pankso@876 298 # /etc/slitaz/applications that we must use.
pankso@870 299 slitaz_apps_conf() {
pankso@840 300 apps_conf=/etc/slitaz/applications.conf
pankso@870 301
pankso@876 302 if [ "$(id -u)" = 0 ]; then
psychomaniak@912 303 user_conf=${apps_conf}
psychomaniak@912 304 new_user_conf="/etc/skel/.config/slitaz/applications.conf"
psychomaniak@912 305 mkdir -p $(dirname $user_conf); cp -f ${apps_conf} ${new_user_conf}
pankso@876 306 else
pankso@876 307 # If started by: startx and with boot opts screen=text
pankso@876 308 user_conf="$HOME/.config/slitaz/applications.conf"
pankso@876 309 if [ ! -f "$user_conf" ]; then
pankso@876 310 mkdir -p $(dirname $user_conf); cp ${apps_conf} ${user_conf}
pankso@876 311 fi
slaxemulator@538 312 fi
pankso@66 313 }
pankso@4 314
pankso@840 315 # Commands
pankso@66 316
pankso@351 317 case "$1" in
pankso@351 318 install-xorg)
pankso@840 319 check_root
pankso@351 320 install_xorg
pankso@870 321 slitaz_apps_conf ;;
pankso@840 322
pankso@415 323 config-xorg)
pankso@840 324 check_root
pankso@870 325 slitaz_apps_conf
pankso@840 326 xorg_conf_d
pankso@840 327 # Handle live option: screen=
pankso@870 328 if grep -qs 'screen=' /proc/cmdline ; then
pascal@564 329 MODE="$(sed 's/.*screen=\([0-9]*x[0-9]*\).*/\1/' < /proc/cmdline)"
pascal@564 330 sed -i "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \
pascal@564 331 /etc/X11/xorg.conf.d/70-Screen.conf
pascal@564 332 fi ;;
pankso@840 333
pankso@870 334 init)
paul@885 335 # We don't need much config files with last Xorg version, So just
paul@885 336 # get files for starting an X session and config the keyboard.
pankso@870 337 check_root
pankso@870 338 slitaz_apps_conf
pankso@871 339 keyboard_conf
pankso@871 340 gen_xorg_conf_file ;;
pankso@870 341
pankso@879 342 keyboard)
pankso@870 343 echo "Generating: 40-Keyboard.conf"
pankso@870 344 keyboard_conf ;;
pankso@870 345
pankso@840 346 *help)
pankso@870 347 echo "Usage: $(basename $0) [install-xorg|config-xorg|init|keyboard]" ;;
psychomaniak@912 348
pankso@840 349
psychomaniak@912 350 get-applist)
psychomaniak@912 351 slitaz_apps_conf
psychomaniak@912 352 gen_applist $2 $3 $4 ;;
pankso@351 353 *)
pankso@615 354 # User can get a new .xinitrc with tazx from cmdline.
psychomaniak@912 355 if [ $(id -u) == 0 ]; then config_dialog
psychomaniak@912 356 else slitaz_apps_conf ; apps_dialog
psychomaniak@912 357 fi
psychomaniak@912 358 # gen_xsession
psychomaniak@912 359 ;;
pankso@351 360 esac
pankso@4 361
pankso@4 362 exit 0