slitaz-tools rev 837

Add slitaz-config and same size for tazkeymap, tazlocale, tazx
author Christophe Lincoln <pankso@slitaz.org>
date Mon Mar 17 22:23:32 2014 +0100 (2014-03-17)
parents e55960fbeceb
children 66de501eccc6
files Makefile boxes/wifi-box tinyutils/tazkeymap tinyutils/tazlocale tinyutils/tazx
line diff
     1.1 --- a/Makefile	Fri Mar 07 01:15:12 2014 +0000
     1.2 +++ b/Makefile	Mon Mar 17 22:23:32 2014 +0100
     1.3 @@ -82,7 +82,7 @@
     1.4  	cp -a licenses $(DESTDIR)$(PREFIX)/share
     1.5  
     1.6  	# /sbin tools.
     1.7 -	for i in tazlocale tazkeymap tazhw hwsetup; do \
     1.8 +	for i in slitaz-config tazlocale tazkeymap tazhw hwsetup; do \
     1.9  		install -m 0755 tinyutils/$$i $(DESTDIR)/sbin; \
    1.10  	done;
    1.11  
     2.1 --- a/boxes/wifi-box	Fri Mar 07 01:15:12 2014 +0000
     2.2 +++ b/boxes/wifi-box	Mon Mar 17 22:23:32 2014 +0100
     2.3 @@ -131,7 +131,7 @@
     2.4  	# Deal with --button values
     2.5  	case $ret in
     2.6  		1) exit 0 ;;
     2.7 -		2) tazweb http://tazpanel:82/network.cgi?wifi && exit 0 ;;
     2.8 +		2) tazweb --notoolbar http://tazpanel:82/network.cgi?wifi && exit 0 ;;
     2.9  		3) /etc/init.d/network.sh stop && exit 0 ;;
    2.10  		3) start_wifi && exit 0 ;;
    2.11  		*) continue ;;
     3.1 --- a/tinyutils/tazkeymap	Fri Mar 07 01:15:12 2014 +0000
     3.2 +++ b/tinyutils/tazkeymap	Mon Mar 17 22:23:32 2014 +0100
     3.3 @@ -49,8 +49,8 @@
     3.4  		check_root
     3.5  		exec 3>&1
     3.6  		value=$($DIALOG  --clear \
     3.7 -		--title " $(_n 'SliTaz keymap configuration') " \
     3.8 -		--menu "" 15 70 5 \
     3.9 +		--title "{ $(_n 'SliTaz keyboard setting') }" \
    3.10 +		--menu "" 20 72 14 \
    3.11  		$(list_keymaps | sort) \
    3.12  		2>&1 1>&3)
    3.13  		retval=$?
     4.1 --- a/tinyutils/tazlocale	Fri Mar 07 01:15:12 2014 +0000
     4.2 +++ b/tinyutils/tazlocale	Mon Mar 17 22:23:32 2014 +0100
     4.3 @@ -102,8 +102,8 @@
     4.4  dialog_menu() {
     4.5  	exec 3>&1
     4.6  	locale=$($DIALOG  --clear \
     4.7 -	--title " $(_n 'SliTaz language configuration') " \
     4.8 -	--menu "" 15 70 9 \
     4.9 +	--title "{ $(_n 'SliTaz language setting') }" \
    4.10 +	--menu "" 20 72 14 \
    4.11  "en" "English" \
    4.12  $(get_locale_name) \
    4.13  2>&1 1>&3)
     5.1 --- a/tinyutils/tazx	Fri Mar 07 01:15:12 2014 +0000
     5.2 +++ b/tinyutils/tazx	Mon Mar 17 22:23:32 2014 +0100
     5.3 @@ -8,6 +8,12 @@
     5.4  # Authors: Christophe Lincoln <pankso@slitaz.org>
     5.5  #          Pascal Bellard <pascal.bellard@slitaz.org>
     5.6  #
     5.7 +
     5.8 +# 20140317: most xsession, xinitrc are obsolet, provided system files
     5.9 +# are in /etc/skel and WM configs files are no longer copyed by tazx 
    5.10 +# to user home. If some configs are needed ba WM's there should be set
    5.11 +# a /usr/bin/wmname-session script.
    5.12 +
    5.13  . /lib/libtaz.sh
    5.14  . /etc/slitaz/slitaz.conf
    5.15  export TEXTDOMAIN='slitaz-tools' #i18n
    5.16 @@ -158,7 +164,6 @@
    5.17  $(_n 'Window Manager:') \Z2$WM\Zn \n\
    5.18  $(_n 'X server:') \Z2Xorg\Zn" 16 70 3 \
    5.19  	"xorg" "$(_n 'Install or reconfigure Xorg')" \
    5.20 -	"xfbdev" "$(_n 'Install TinyX server Xfbdev')" \
    5.21  	"quit" "$(_n 'Quit Tazx utility')" \
    5.22  	2>&1 1>&3)
    5.23  	retval=$?
    5.24 @@ -174,9 +179,6 @@
    5.25  	case $value in
    5.26  		xorg)
    5.27  			install_xorg ;;
    5.28 -		xfbdev)
    5.29 -			# FIXME: Much to do here, for now just install Xfbdev.
    5.30 -			tazpkg get-install xorg-server-Xfbdev ;;
    5.31  		*) exit 0 ;;
    5.32  	esac
    5.33  }