slitaz-tools rev 65
Support slim config with tazx
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Feb 22 19:51:43 2008 +0100 (2008-02-22) |
parents | b152d5a5c35a |
children | b7cf20bb05db |
files | tinyutils/tazx |
line diff
1.1 --- a/tinyutils/tazx Fri Feb 22 15:50:18 2008 +0100 1.2 +++ b/tinyutils/tazx Fri Feb 22 19:51:43 2008 +0100 1.3 @@ -18,6 +18,20 @@ 1.4 WM=jwm 1.5 fi 1.6 1.7 +# Change backgroud image if the 3/4 is not respected. 1.8 +change_jwm_background() 1.9 +{ 1.10 + if echo $NEW_SCREEN | grep -q '1280x1024'; then 1.11 + sed -i s/'1024x768.png'/'1280x1024.png'/ $JWM_CONFIG 1.12 + fi 1.13 + if echo $NEW_SCREEN | grep -q '1024x768'; then 1.14 + sed -i s/'1280x1024.png'/'1024x768.png'/ $JWM_CONFIG 1.15 + fi 1.16 + if echo $NEW_SCREEN | grep -q '1280x800'; then 1.17 + sed -i s/'1024x768.png'/'1280x800.png'/ $JWM_CONFIG 1.18 + fi 1.19 +} 1.20 + 1.21 # Main dialog. 1.22 exec 3>&1 1.23 value=`$DIALOG --help-button \ 1.24 @@ -73,25 +87,36 @@ 1.25 Xvesa -ac -shadow -screen 800x600x16 -br & 1.26 exec xterm -cr orange -geometry 80x35+0-0 ;; 1.27 *) 1.28 - SCREEN=$value ;; 1.29 + NEW_SCREEN=$value ;; 1.30 esac 1.31 1.32 +# Slim config if root. 1.33 +if test $(id -u) = 0; then 1.34 + # Get current screen size or set default to 1024x768x24 to sed 1.35 + # config file with the new value. 1.36 + if [ -f /etc/X11/screen.conf ]; then 1.37 + . /etc/X11/screen.conf 1.38 + else 1.39 + SCREEN=1024x768x24 1.40 + fi 1.41 + if [ -f /etc/slim.conf ]; then 1.42 + mkdir -p /etc/X11 1.43 + echo "SCREEN=$NEW_SCREEN" > /etc/X11/screen.conf 1.44 + sed -i s/"$SCREEN"/"$NEW_SCREEN"/ /etc/slim.conf 1.45 + fi 1.46 + JWM_CONFIG=/etc/jwm/system.jwmrc 1.47 + change_jwm_background 1.48 +fi 1.49 + 1.50 +# ~/.xinitrc for slim login. 1.51 +echo "$WM" > $HOME/.xinitrc 1.52 + 1.53 # Copy a JWM system config if any present in user home 1.54 if [ ! -f "$HOME/.jwmrc" ]; then 1.55 cp /etc/jwm/system.jwmrc $HOME/.jwmrc 1.56 fi 1.57 -# Change backgroud image if the 3/4 is not respected. 1.58 -if echo $SCREEN | grep -q '1280x1024'; then 1.59 - sed -i s/'1024x768.png'/'1280x1024.png'/ $HOME/.jwmrc 1.60 -fi 1.61 -if echo $SCREEN | grep -q '1024x768'; then 1.62 - sed -i s/'1280x1024.png'/'1024x768.png'/ $HOME/.jwmrc 1.63 -fi 1.64 -# Tile Wallpaper for 1280x800. 1.65 -if echo $SCREEN | grep -q '1280x800'; then 1.66 - sed -i s/'type="image"'/'type="tile"'/ $HOME/.jwmrc 1.67 - sed -i s/'1024x768.png'/'1280x1024.png'/ $HOME/.jwmrc 1.68 -fi 1.69 +JWM_CONFIG=$HOME/.jwmrc 1.70 +change_jwm_background 1.71 1.72 # e17 start with enlightenment_start. 1.73 if [ "$WM" == "e17" ]; then 1.74 @@ -104,18 +129,17 @@ 1.75 cat > $HOME/.xsession << _EOT_ 1.76 # ~/.xsession: Start X window session on your system. 1.77 # 1.78 -$XSERVER -ac -shadow $XSEVER_OPTS -screen $SCREEN -mouse $MOUSE & 1.79 -#mpg123 sound.wav & 1.80 -#xterm -bg black -fg white -cr orange & 1.81 +$XSERVER -ac -shadow $XSEVER_OPTS -screen $NEW_SCREEN -mouse $MOUSE & 1.82 +#xterm & 1.83 #xpad & 1.84 exec $WM 1.85 _EOT_ 1.86 - 1.87 chmod 700 $HOME/.xsession 1.88 1.89 # Console messages. 1.90 +echo "" 1.91 echo "X server : $XSERVER" 1.92 -echo "Screen : $SCREEN" 1.93 +echo "Screen : $NEW_SCREEN" 1.94 echo "Exec WM : $WM" 1.95 echo "" 1.96