slitaz-tools rev 608 4.3

Tiny edits
author Paul Issott <paul@slitaz.org>
date Wed Jun 01 19:27:03 2011 +0100 (2011-06-01)
parents 25743a237def
children 2c9bd787c7f6
files installer/README installer/tazinst tazbox/tazbox
line diff
     1.1 --- a/installer/README	Wed Jun 01 20:14:10 2011 +0200
     1.2 +++ b/installer/README	Wed Jun 01 19:27:03 2011 +0100
     1.3 @@ -3,7 +3,7 @@
     1.4  
     1.5  
     1.6  The first SliTaz installer uses ncurses Dialog within a SHell script. As of
     1.7 -April 2011 it is the last SliTaz home made tool which doesn't have a
     1.8 +April 2011 it is the last SliTaz home made tool that doesn't have a
     1.9  desktop integrated interface. So we must think differently and make changes,
    1.10  we must also keep in mind that the first installer had some crappy code
    1.11  since it was written at the start of the project.
     2.1 --- a/installer/tazinst	Wed Jun 01 20:14:10 2011 +0200
     2.2 +++ b/installer/tazinst	Wed Jun 01 19:27:03 2011 +0100
     2.3 @@ -43,7 +43,7 @@
     2.4  	echo -e "  -t <type>      `gettext \"Install type (cdrom|usb|iso|web|weboot).\"`"
     2.5  	echo -e "  -m <source>    `gettext \"Source media (ex: file.iso|usb partition|web url)\"`"
     2.6  	echo -e "  -p <partition> `gettext \"Partition where SliTaz will be installed (ex:/dev/hda3).\"`"
     2.7 -	echo -e "  -f <fs>        `gettext \"Partition will be formatted (fs=ext2|ext3|ext4|etc..).\"`"
     2.8 +	echo -e "  -f <fs>        `gettext \"Partition to be formatted (fs=ext2|ext3|ext4|etc..).\"`"
     2.9  	echo -e "  -g             `gettext \"Install Grub.\"`"
    2.10  	echo -e "  -w             `gettext \"Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0).\"`"
    2.11  	echo -e "  -d             `gettext \"Debug mode.\"`"
    2.12 @@ -63,8 +63,8 @@
    2.13  		umount $TARGET_ROOT 2>>$LOG
    2.14  	fi
    2.15  	echo "Error $@"
    2.16 -	echo "Installation canceled"
    2.17 -	test $(id -u) = 0 && echo "Installation canceled on error $@" >> $LOG
    2.18 +	echo "Installation cancelled"
    2.19 +	test $(id -u) = 0 && echo "Installation cancelled on error $@" >> $LOG
    2.20  	exit $1
    2.21  }
    2.22  
    2.23 @@ -774,8 +774,8 @@
    2.24  	sleep 2
    2.25  }
    2.26  
    2.27 -# /home can be on a separate partition. If default user exist in /home
    2.28 -# we remove default file crated by users_settings().
    2.29 +# /home can be on a separate partition. If default user exists in /home
    2.30 +# we remove default file created by users_settings().
    2.31  home_config()
    2.32  {
    2.33  	debug "home_config: $TGT_HOME"
     3.1 --- a/tazbox/tazbox	Wed Jun 01 20:14:10 2011 +0200
     3.2 +++ b/tazbox/tazbox	Wed Jun 01 19:27:03 2011 +0100
     3.3 @@ -157,27 +157,27 @@
     3.4  
     3.5  # TZ functions
     3.6  tz_main() {
     3.7 -    text=$(gettext "TimeZone Configuration")
     3.8 -    zi="/usr/share/zoneinfo/"
     3.9 -    for t in $(find $zi -type f | sed s,$zi,,g)
    3.10 -    do
    3.11 -        echo -e "$t"
    3.12 -    done | \
    3.13 -    yad --list --title="SliTaz TZ" --window-icon=$icon \
    3.14 -        --width=500 --height=380 --separator="" \
    3.15 -        --center --sticky --on-top \
    3.16 -        --image=preferences-desktop-locale --image-on-top \
    3.17 -        --text="<b>$text</b>" --print-column=1 \
    3.18 -        --column $(gettext "Name")
    3.19 +    	text=$(gettext "TimeZone Configuration")
    3.20 +    	zi="/usr/share/zoneinfo/"
    3.21 +    	for t in $(find $zi -type f | sed s,$zi,,g)
    3.22 +    	do
    3.23 +        	echo -e "$t"
    3.24 +    	done | \
    3.25 +    	yad --list --title="SliTaz TZ" --window-icon=$icon \
    3.26 +        	--width=500 --height=380 --separator="" \
    3.27 +        	--center --sticky --on-top \
    3.28 +        	--image=preferences-desktop-locale --image-on-top \
    3.29 +        	--text="<b>$text</b>" --print-column=1 \
    3.30 +        	--column $(gettext "Name")
    3.31  }
    3.32  
    3.33  tz() {
    3.34 -    timezone=$(tz_main)
    3.35 -    case $? in
    3.36 -        1) exit 0 ;;
    3.37 -        *) continue ;;
    3.38 -    esac
    3.39 -    [ "$timezone" ] && echo $timezone > /etc/TZ
    3.40 +    	timezone=$(tz_main)
    3.41 +    	case $? in
    3.42 +        	1) exit 0 ;;
    3.43 +        	*) continue ;;
    3.44 +    	esac
    3.45 +    	[ "$timezone" ] && echo $timezone > /etc/TZ
    3.46  }
    3.47  
    3.48  #
    3.49 @@ -239,8 +239,8 @@
    3.50  		locale ;;
    3.51  	keymap)
    3.52  		keymap ;;
    3.53 -    tz)
    3.54 -        tz ;;
    3.55 +    	tz)
    3.56 +        	tz ;;
    3.57  	boot)
    3.58  		# This command is used at first boot to configure system.
    3.59  		Xorg -br -quiet -nolisten tcp :1 &