SliTaz Repositories

     1.1 --- a/tinyutils/tazx	Wed Apr 23 21:57:53 2008 +0000
     1.2 +++ b/tinyutils/tazx	Thu Apr 24 20:30:08 2008 +0200
     1.3 @@ -180,13 +180,13 @@
     1.4  # You can use F1 with Slim or 'tazx' to configure permanantly 
     1.5  # your default WM: tazx e17
     1.6  #
     1.7 -WM=openbox
     1.8 +WM=openbox-session
     1.9  
    1.10  case $1 in
    1.11  	e17|enlightenment_start)
    1.12  		exec enlightenment_start
    1.13  		;;
    1.14 -	openbox|openbox-session)
    1.15 +	openbox|openbox-session|ob)
    1.16  		exec openbox-session
    1.17  		;;
    1.18  	jwm)
    1.19 @@ -194,11 +194,6 @@
    1.20  		exec jwm
    1.21  		;;
    1.22  	*)
    1.23 -		# LXpanel by default with JWM (use less memory started 
    1.24 -		# from here rater than from StartupCommand).
    1.25 -		if [ "$WM" = "openbox" ]; then
    1.26 -			lxpanel &
    1.27 -		fi
    1.28  		exec $WM
    1.29  		;;
    1.30  esac
    1.31 @@ -226,20 +221,22 @@
    1.32  # Copy a JWM system config if any present in user home.
    1.33  jwm_config()
    1.34  {
    1.35 -	JWM_CONFIG=$HOME/.jwmrc
    1.36 -	if [ ! -f "$JWM_CONFIG" ]; then
    1.37 -		cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.38 -	fi
    1.39 -	# In Live mode hacker/root JWM config dose not exist ans $HOME is 
    1.40 -	# ot set, this is because tazx is executed by boot scripts.
    1.41 -	if [ ! -f "/home/hacker/.jwmrc" ]; then
    1.42 -		JWM_CONFIG=/home/hacker/.jwmrc
    1.43 -		cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.44 -		chown hacker.hacker $JWM_CONFIG
    1.45 -	fi
    1.46 -	if [ ! -f "/root/.jwmrc" -a `id -u` = 0 ]; then
    1.47 -		JWM_CONFIG=/root/.jwmrc
    1.48 -		cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.49 +	if [ -d "/var/lib/tazpkg/installed/jwm" ]; then
    1.50 +		JWM_CONFIG=$HOME/.jwmrc
    1.51 +		if [ ! -f "$JWM_CONFIG" ]; then
    1.52 +			cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.53 +		fi
    1.54 +		# In Live mode hacker/root JWM config dose not exist ans $HOME is 
    1.55 +		# ot set, this is because tazx is executed by boot scripts.
    1.56 +		if [ ! -f "/home/hacker/.jwmrc" ]; then
    1.57 +			JWM_CONFIG=/home/hacker/.jwmrc
    1.58 +			cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.59 +			chown hacker.hacker $JWM_CONFIG
    1.60 +		fi
    1.61 +		if [ ! -f "/root/.jwmrc" -a `id -u` = 0 ]; then
    1.62 +			JWM_CONFIG=/root/.jwmrc
    1.63 +			cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.64 +		fi
    1.65  	fi
    1.66  }
    1.67