# HG changeset patch # User Paul Issott # Date 1306952823 -3600 # Node ID 9f5fa18b9721fceac98c4474289258866b947de8 # Parent 25743a237def46194100c8ec71aa8d1d6bea71cf Tiny edits diff -r 25743a237def -r 9f5fa18b9721 installer/README --- a/installer/README Wed Jun 01 20:14:10 2011 +0200 +++ b/installer/README Wed Jun 01 19:27:03 2011 +0100 @@ -3,7 +3,7 @@ The first SliTaz installer uses ncurses Dialog within a SHell script. As of -April 2011 it is the last SliTaz home made tool which doesn't have a +April 2011 it is the last SliTaz home made tool that doesn't have a desktop integrated interface. So we must think differently and make changes, we must also keep in mind that the first installer had some crappy code since it was written at the start of the project. diff -r 25743a237def -r 9f5fa18b9721 installer/tazinst --- a/installer/tazinst Wed Jun 01 20:14:10 2011 +0200 +++ b/installer/tazinst Wed Jun 01 19:27:03 2011 +0100 @@ -43,7 +43,7 @@ echo -e " -t `gettext \"Install type (cdrom|usb|iso|web|weboot).\"`" echo -e " -m `gettext \"Source media (ex: file.iso|usb partition|web url)\"`" echo -e " -p `gettext \"Partition where SliTaz will be installed (ex:/dev/hda3).\"`" - echo -e " -f `gettext \"Partition will be formatted (fs=ext2|ext3|ext4|etc..).\"`" + echo -e " -f `gettext \"Partition to be formatted (fs=ext2|ext3|ext4|etc..).\"`" echo -e " -g `gettext \"Install Grub.\"`" echo -e " -w `gettext \"Dual-boot a Windows partition (auto|hd, ex:hd0,0).\"`" echo -e " -d `gettext \"Debug mode.\"`" @@ -63,8 +63,8 @@ umount $TARGET_ROOT 2>>$LOG fi echo "Error $@" - echo "Installation canceled" - test $(id -u) = 0 && echo "Installation canceled on error $@" >> $LOG + echo "Installation cancelled" + test $(id -u) = 0 && echo "Installation cancelled on error $@" >> $LOG exit $1 } @@ -774,8 +774,8 @@ sleep 2 } -# /home can be on a separate partition. If default user exist in /home -# we remove default file crated by users_settings(). +# /home can be on a separate partition. If default user exists in /home +# we remove default file created by users_settings(). home_config() { debug "home_config: $TGT_HOME" diff -r 25743a237def -r 9f5fa18b9721 tazbox/tazbox --- a/tazbox/tazbox Wed Jun 01 20:14:10 2011 +0200 +++ b/tazbox/tazbox Wed Jun 01 19:27:03 2011 +0100 @@ -157,27 +157,27 @@ # TZ functions tz_main() { - text=$(gettext "TimeZone Configuration") - zi="/usr/share/zoneinfo/" - for t in $(find $zi -type f | sed s,$zi,,g) - do - echo -e "$t" - done | \ - yad --list --title="SliTaz TZ" --window-icon=$icon \ - --width=500 --height=380 --separator="" \ - --center --sticky --on-top \ - --image=preferences-desktop-locale --image-on-top \ - --text="$text" --print-column=1 \ - --column $(gettext "Name") + text=$(gettext "TimeZone Configuration") + zi="/usr/share/zoneinfo/" + for t in $(find $zi -type f | sed s,$zi,,g) + do + echo -e "$t" + done | \ + yad --list --title="SliTaz TZ" --window-icon=$icon \ + --width=500 --height=380 --separator="" \ + --center --sticky --on-top \ + --image=preferences-desktop-locale --image-on-top \ + --text="$text" --print-column=1 \ + --column $(gettext "Name") } tz() { - timezone=$(tz_main) - case $? in - 1) exit 0 ;; - *) continue ;; - esac - [ "$timezone" ] && echo $timezone > /etc/TZ + timezone=$(tz_main) + case $? in + 1) exit 0 ;; + *) continue ;; + esac + [ "$timezone" ] && echo $timezone > /etc/TZ } # @@ -239,8 +239,8 @@ locale ;; keymap) keymap ;; - tz) - tz ;; + tz) + tz ;; boot) # This command is used at first boot to configure system. Xorg -br -quiet -nolisten tcp :1 &