slitaz-tools rev 403

slitaz-installer: tiny fix and edits
author Paul Issott <paul@slitaz.org>
date Sat Nov 07 14:06:48 2009 +0000 (2009-11-07)
parents 14683938d8d4
children d253e1434dbb
files installer/slitaz-installer
line diff
     1.1 --- a/installer/slitaz-installer	Sat Nov 07 00:03:26 2009 +0100
     1.2 +++ b/installer/slitaz-installer	Sat Nov 07 14:06:48 2009 +0000
     1.3 @@ -263,15 +263,15 @@
     1.4  	ROOT_PASSWD=`$DIALOG --title " Root password " \
     1.5  		--backtitle "$BACKLIST" --clear \
     1.6  		--colors --nocancel --inputbox "
     1.7 -The root administrator privilege let you manage and configure the full \
     1.8 -system, root user can damage your system so you should put setup a strong \
     1.9 -password with special characters and/or numbers.
    1.10 +The root administrator privilege lets you manage and configure the full \
    1.11 +system. A root user can damage your system so you should always setup a \
    1.12 +strong password with special characters and/or numbers.
    1.13  
    1.14  \Z2Please specify the Root password for your new system:\Zn" 18 70 "root" 2>&1 1>&3`
    1.15  	retval=$?
    1.16  	exec 3>&-
    1.17  	check_retval
    1.18 -	# Pevent empty value.
    1.19 +	# Prevent empty value.
    1.20  	if [ -z $ROOT_PASSWD ]; then
    1.21  		ROOT_PASSWD="root"
    1.22  	fi
    1.23 @@ -280,14 +280,14 @@
    1.24  	USER=`$DIALOG --title " User name " \
    1.25  		--backtitle "$BACKLIST" --clear \
    1.26  		--colors --nocancel --inputbox "
    1.27 -The default user for the system will have his personnal files stored \
    1.28 -in /home/*user* and will automaticaly be add to the audio group.
    1.29 +The default user for the system will have his personal files stored \
    1.30 +in /home/*user* (and will automatically be added to the audio group).
    1.31  
    1.32  \Z2Default user name login:\Zn" 18 70 "tux" 2>&1 1>&3`
    1.33  	retval=$?
    1.34  	exec 3>&-
    1.35  	check_retval
    1.36 -	# Pevent empty value.
    1.37 +	# Prevent empty value.
    1.38  	if [ -z $USER ]; then
    1.39  		USER="tux"
    1.40  	fi
    1.41 @@ -296,14 +296,14 @@
    1.42  	USER_PASSWD=`$DIALOG --title " User password " \
    1.43  		--backtitle "$BACKLIST" --clear \
    1.44  		--colors --nocancel --inputbox "
    1.45 -The password for default user $USER. It may also be a security hole if to \
    1.46 -weak and should realy be strong if you will use SSH connection trought the web.
    1.47 +The password for default user $USER. It may also be a security risk if too \
    1.48 +weak and should always be strong if you use a SSH connection through the web.
    1.49  
    1.50  \Z2Please specify $USER password:\Zn" 18 70 "tux" 2>&1 1>&3`
    1.51  	retval=$?
    1.52  	exec 3>&-
    1.53  	check_retval
    1.54 -	# Pevent empty value.
    1.55 +	# Prevent empty value.
    1.56  	if [ -z $USER_PASSWD ]; then
    1.57  		USER_PASSWD="tux"
    1.58  	fi
    1.59 @@ -433,7 +433,7 @@
    1.60  addgroup $USER audio
    1.61  echo "$USER:$USER_PASSWD" | chpasswd
    1.62  if [ ! -d /home/$USER ]; then
    1.63 -	cp /etc/skel /home/$USER
    1.64 +	cp -a /etc/skel /home/$USER
    1.65  	chown -R $USER.$USER /home/$USER
    1.66  	# Path for user desktop files.
    1.67  	for i in /home/$USER/.local/share/applications/*.desktop
    1.68 @@ -443,7 +443,7 @@
    1.69  fi
    1.70  # Slim default user.
    1.71  if [ -f /etc/slim.conf ]; then
    1.72 -	sed -i s/"default_user .*"/"default_user        $USER"/\
    1.73 +	sed -i s/"default_user .*"/"default_user        $USER"/ \
    1.74  		/etc/slim.conf
    1.75  fi
    1.76  _EOF_
    1.77 @@ -656,7 +656,7 @@
    1.78  The installer will upgrade the target by saving all configuration files and \
    1.79  the list of installed packages. Then, it will clean the partition and install the \
    1.80  version of SliTaz contained on the cdrom, restore the configuration files and \
    1.81 -reinstall all packages which are not present on the cdrom. You will need an active \
    1.82 +reinstall any packages which are not present on the cdrom. You will need an active \
    1.83  internet connection before upgrading.\n\n
    1.84  \Z2Partition containing the system upgrade:\Zn" 18 70 2>&1 1>&3`
    1.85  	retval=$?
    1.86 @@ -883,7 +883,7 @@
    1.87  		--yes-label "Exit" \
    1.88  		--no-label "Reboot" \
    1.89  		--clear --colors --yesno "\n
    1.90 -Upgrade finished. You can know restart (reboot) \
    1.91 +Upgrade finished. You can now restart (reboot) \
    1.92  from your SliTaz GNU/Linux system.\n\n
    1.93  Packages on the cdrom      : $pkgscd\n
    1.94  Packages installed from the mirror : $pkginst\n" 18 70