SliTaz Repositories

     1.1 --- a/installer/slitaz-installer	Fri Jan 22 09:14:16 2010 +0100
     1.2 +++ b/installer/slitaz-installer	Fri Jan 22 10:03:38 2010 +0100
     1.3 @@ -113,6 +113,7 @@
     1.4  	echo "XXX"
     1.5  	mkdir -p /media/cdrom
     1.6  	sleep 1
     1.7 +	# First try to mount a cdrom
     1.8  	if mount -t iso9660 $CDROM /media/cdrom 2>>$LOG; then
     1.9  		echo "XXX" && echo 60
    1.10  		echo -e "\nUsing file from cdrom ($CDROM)..."
    1.11 @@ -129,6 +130,7 @@
    1.12  			sleep 2
    1.13  		fi
    1.14  	fi
    1.15 +
    1.16  	echo "XXX" && echo 90
    1.17  	echo -e "\nChecking installation media..."
    1.18  	echo "XXX"
    1.19 @@ -216,14 +218,14 @@
    1.20  ask_for_home()
    1.21  {
    1.22  	exec 3>&1
    1.23 -	HOME_DEV=`$DIALOG --title " Root Partition " \
    1.24 +	HOME_DEV=`$DIALOG --title " Home Partition " \
    1.25  		--backtitle "$BACKLIST" --clear \
    1.26  		--extra-label "List" --extra-button \
    1.27  		--colors --inputbox "
    1.28 -On most GNU/Linux system users personnal files are stored in the directoty \
    1.29 +On most GNU/Linux systems users personal files are stored in the directory \
    1.30  /home. Home can be on a separate partition or another hard disk.
    1.31  
    1.32 -\Z2Home partition to use (Option):\Zn" 18 70 2>&1 1>&3`
    1.33 +\Z2Home partition to use (Optional):\Zn" 18 70 2>&1 1>&3`
    1.34  	retval=$?
    1.35  	exec 3>&-
    1.36  	check_retval
    1.37 @@ -256,8 +258,8 @@
    1.38  		--clear --colors --yesno "
    1.39  Here you can format the /home partition: $HOME_DEV
    1.40  
    1.41 -SliTaz use ext3 by default but another filesystem can be used if wanted, \
    1.42 -for this please adjust /etc/fstab afer installation.
    1.43 +SliTaz uses ext3 by default but another filesystem can be used if wanted, \
    1.44 +for this please adjust /etc/fstab after installation.
    1.45  
    1.46  \Z2Do you want to format (Option): $HOME_DEV\Zn" 18 70
    1.47  	retval=$?
    1.48 @@ -315,8 +317,8 @@
    1.49  	USER=`$DIALOG --title " User name " \
    1.50  		--backtitle "$BACKLIST" --clear \
    1.51  		--colors --nocancel --inputbox "
    1.52 -The default user for the system will have his personal files stored \
    1.53 -in /home/*user* (and will automatically be added to the audio group).
    1.54 +The default user for the system will have their personal files stored \
    1.55 +in /home/*user* (and will be automatically added to the audio group).
    1.56  
    1.57  \Z2Default user name login:\Zn" 18 70 "tux" 2>&1 1>&3`
    1.58  	retval=$?
    1.59 @@ -331,7 +333,7 @@
    1.60  	USER_PASSWD=`$DIALOG --title " User password " \
    1.61  		--backtitle "$BACKLIST" --clear \
    1.62  		--colors --nocancel --inputbox "
    1.63 -The password for default user $USER. It may also be a security risk if too \
    1.64 +The password for default user $USER. It may be a security risk if too \
    1.65  weak and should always be strong if you use a SSH connection through the web.
    1.66  
    1.67  \Z2Please specify $USER password:\Zn" 18 70 "tux" 2>&1 1>&3`
    1.68 @@ -351,7 +353,7 @@
    1.69  		--backtitle "$BACKLIST" \
    1.70  		--clear --colors --yesno "
    1.71  Installation settings summary and last chance to cancel or restart all \
    1.72 -installator steps.
    1.73 +installation steps.
    1.74  
    1.75  Root partition: $TARGET_DEV
    1.76  Home partition: $HOME_DEV
    1.77 @@ -395,7 +397,7 @@
    1.78  		mkfs.ext3 -L "Home" $HOME_DEV >>$LOG 2>>$LOG
    1.79  	else
    1.80  		echo "XXX" && echo 70
    1.81 -		echo -e "\nThe partition ($HOME_DEV) will be keeped..."
    1.82 +		echo -e "\nThe partition ($HOME_DEV) will be kept..."
    1.83  		echo "XXX"
    1.84  		sleep 2
    1.85  	fi
    1.86 @@ -419,7 +421,7 @@
    1.87  {
    1.88  	if [ "$CLEAN" == "clean" ]; then
    1.89  		echo "XXX" && echo 15
    1.90 -		echo -e "\nCleaning the root partition ($TARGET_DEV)..."
    1.91 +		echo -e "\nCleaning the root partition ($TARGET_DEV)"
    1.92  		echo "XXX"
    1.93  		# Keep /home in case of reinstall.
    1.94  		cd $TARGET_ROOT
    1.95 @@ -610,7 +612,7 @@
    1.96  	clean_target
    1.97  
    1.98  	echo "XXX" && echo 20
    1.99 -	echo -e "\nInstalling the kernel ($KERNEL)..."
   1.100 +	echo -e "\nInstalling the kernel ($KERNEL)"
   1.101  	echo "XXX"
   1.102  	install_kernel
   1.103  
   1.104 @@ -679,7 +681,7 @@
   1.105  		0)
   1.106  			(
   1.107  			echo "XXX" && echo 50
   1.108 -			echo -e "\nRunning grub-install on : $TARGET_DISK..."
   1.109 +			echo -e "\nRunning grub-install on : $TARGET_DISK"
   1.110  			echo "XXX"
   1.111  			grub-install --no-floppy \
   1.112  				--root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG
   1.113 @@ -690,7 +692,7 @@
   1.114  			) |
   1.115  			$DIALOG --title " GRUB install " \
   1.116  				--backtitle "$BACKLIST" \
   1.117 -				--gauge "Installating GRUB..." 18 70 0 ;;
   1.118 +				--gauge "Installing GRUB..." 18 70 0 ;;
   1.119  		1)
   1.120  			echo "grub_install: NO" >>$LOG ;;
   1.121  		255)
   1.122 @@ -703,12 +705,12 @@
   1.123  {
   1.124  	(
   1.125  	echo "XXX" && echo 25
   1.126 -	echo -e "\nCopying the log files ($LOG)..."
   1.127 +	echo -e "\nCopying the log files ($LOG)"
   1.128  	echo "XXX"
   1.129  	cp -a $LOG $TARGET_ROOT/var/log
   1.130  	sleep 2
   1.131  	echo "XXX" && echo 50
   1.132 -	echo -e "\nUnmounting the target ($TARGET_DEV)..."
   1.133 +	echo -e "\nUnmounting the target ($TARGET_DEV)"
   1.134  	echo "XXX"
   1.135  	if mount | grep -q $TARGET_ROOT; then
   1.136  		umount $TARGET_ROOT 2>/dev/null
   1.137 @@ -870,7 +872,7 @@
   1.138  	sleep 2
   1.139  
   1.140  	echo "XXX" && echo 25
   1.141 -	echo -e "\nInstalling the kernel ($KERNEL)..."
   1.142 +	echo -e "\nInstalling the kernel ($KERNEL)"
   1.143  	echo "XXX"
   1.144  	install_kernel
   1.145