SliTaz Repositories

     1.1 --- a/tinyutils/tazx	Wed May 06 16:38:10 2009 +0000
     1.2 +++ b/tinyutils/tazx	Mon May 11 22:03:15 2009 +0200
     1.3 @@ -1,24 +1,21 @@
     1.4  #!/bin/sh
     1.5  #
     1.6  # Tazx - Ncurses X configuration for SliTaz GNU/Linux using Dialog boxes.
     1.7 -# This tinyutils is part of slitaz-tools.
     1.8 +# This tinyutils is part of slitaz-tools. Tazx can configure Xvesa kdrive
     1.9 +# and Xorg with several Window Manager.
    1.10  #
    1.11 -# (c) 20080609 SliTaz GNU/Linux - GNU gpl v3.
    1.12 +# (c) 2009 SliTaz GNU/Linux - GNU gpl v3.
    1.13  # Authors: Christophe Lincoln <pankso@slitaz.org>
    1.14  #          Pascal Bellard <pascal.bellard@slitaz.org>
    1.15  #
    1.16  : ${DIALOG=tazdialog}
    1.17  
    1.18 -# Variables.
    1.19 +# Default value.
    1.20  XSERVER=Xvesa
    1.21 -DOC=/usr/share/doc/slitaz-tools/tazx.txt
    1.22 -MOUSE=/dev/input/mice,5
    1.23 -# WM can be specified on cmdline.
    1.24 -if [ -n "$1" ]; then
    1.25 -	WM=$1
    1.26 -else
    1.27 -	WM=openbox
    1.28 -fi
    1.29 +KEYBD=keyboard
    1.30 +MOUSE=mouse,5,/dev/input/mice
    1.31 +WM=openbox
    1.32 +
    1.33  # Default user for config files in Live mode.
    1.34  USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1`
    1.35  
    1.36 @@ -130,11 +127,11 @@
    1.37  			tazpkg get-install xorg-server
    1.38  			tazpkg get-install xorg-xf86-video-$value
    1.39  			Xorg -configure :1
    1.40 -			mv /root/xorg.conf.new /etc/X11/xorg.conf
    1.41 +			mv -f /root/xorg.conf.new /etc/X11/xorg.conf
    1.42  			patch_xorg_kbd
    1.43  			sed -i 's|/usr/bin/Xvesa|/usr/bin/Xorg|' /etc/slim.conf
    1.44  			sed -i s/"^xserver_arguments"/'\#xserver_arguments'/ /etc/slim.conf
    1.45 -			XSERVER=Xorg;;
    1.46 +			XSERVER=Xorg ;;
    1.47  	esac
    1.48  }
    1.49  
    1.50 @@ -192,10 +189,11 @@
    1.51  		echo "SCREEN=$NEW_SCREEN" > /etc/X11/screen.conf
    1.52  		# Get current screen size and sed config file with the new value.
    1.53  		if [ -f /etc/slim.conf ]; then
    1.54 -			RES=$(grep ^xserver_arguments /etc/slim.conf | sed 's/xserver_arguments.*-screen *//')
    1.55 -			sed -i "s/\(xserver_arguments.*-screen\).*/\1 $NEW_SCREEN/" /etc/slim.conf
    1.56 +			RES=$(grep ^xserver_arguments /etc/slim.conf | \
    1.57 +				sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
    1.58 +			#sed -i "s/\(xserver_arguments.*-screen\).*/\1 $NEW_SCREEN/" /etc/slim.conf
    1.59 +			sed -i s/"-screen $RES"/"-screen $NEW_SCREEN"/ /etc/slim.conf
    1.60  		fi
    1.61 -		JWM_CONFIG=/etc/jwm/system.jwmrc
    1.62  	fi
    1.63  }
    1.64  
    1.65 @@ -350,8 +348,12 @@
    1.66  	if [ "$XSERVER " == "Xorg" ]; then
    1.67  		echo 'Xorg &' >> $HOME/.xsession
    1.68  	else
    1.69 -		echo "$XSERVER -ac -shadow $XSEVER_OPTS -screen $NEW_SCREEN -mouse $MOUSE &" \
    1.70 -			>> $HOME/.xsession
    1.71 +		cat >> $HOME/.xsession << _EOT_
    1.72 +$XSERVER -ac -shadow $XSEVER_OPTS \\
    1.73 +	-screen $NEW_SCREEN \\
    1.74 +	-keybd $KEYBD \\
    1.75 +	-mouse $MOUSE &
    1.76 +_EOT_
    1.77  	fi
    1.78  	echo '#xterm &' >> $HOME/.xsession
    1.79  	echo '#xpad &' >> $HOME/.xsession
    1.80 @@ -367,10 +369,36 @@
    1.81  #  Tazx sequence  #
    1.82  ###################
    1.83  
    1.84 -[ -n "$NEW_SCREEN" ] || screen_config_dialog
    1.85 -slim_config
    1.86 -wm_config
    1.87 -creat_xinitrc
    1.88 -creat_xsession
    1.89 +case "$1" in
    1.90 +	show-config)
    1.91 +		. /etc/X11/screen.conf
    1.92 +		echo ""
    1.93 +		echo "X11 screen resolution: $SCREEN"
    1.94 +		echo ""
    1.95 +		echo "Slim configuration for X server:"
    1.96 +		cat /etc/slim.conf | grep ^default_xserver
    1.97 +		cat /etc/slim.conf | grep ^xserver_arguments
    1.98 +		echo "" ;;
    1.99 +	install-xorg)
   1.100 +		# WM can be specified on cmdline.
   1.101 +		if [ -n "$2" ]; then
   1.102 +			WM=$2	
   1.103 +		fi
   1.104 +		install_xorg
   1.105 +		slim_config
   1.106 +		wm_config
   1.107 +		creat_xinitrc
   1.108 +		creat_xsession ;;
   1.109 +	*)
   1.110 +		# WM can be specified on cmdline.
   1.111 +		if [ -n "$1" ]; then
   1.112 +			WM=$1	
   1.113 +		fi
   1.114 +		[ -n "$NEW_SCREEN" ] || screen_config_dialog
   1.115 +		slim_config
   1.116 +		wm_config
   1.117 +		creat_xinitrc
   1.118 +		creat_xsession ;;
   1.119 +esac
   1.120  
   1.121  exit 0