slitaz-tools rev 593

Tiny edits
author Paul Issott <paul@slitaz.org>
date Sat Apr 30 16:27:52 2011 +0100 (2011-04-30)
parents fb3a32f8629b
children b094a088e5d2
files README installer/README tazbox/tazbox
line diff
     1.1 --- a/README	Sat Apr 30 16:11:56 2011 +0200
     1.2 +++ b/README	Sat Apr 30 16:27:52 2011 +0100
     1.3 @@ -13,7 +13,7 @@
     1.4  manage SliTaz.
     1.5  
     1.6  
     1.7 -More tools informations
     1.8 +More tools information
     1.9  -----------------------
    1.10  
    1.11      * installer/README
     2.1 --- a/installer/README	Sat Apr 30 16:11:56 2011 +0200
     2.2 +++ b/installer/README	Sat Apr 30 16:27:52 2011 +0100
     2.3 @@ -2,19 +2,19 @@
     2.4  ================================================================================
     2.5  
     2.6  
     2.7 -The first SliTaz installer use ncurses Dialog within a SHell script. At the
     2.8 -date of april 2011 is is the last SliTaz home make tools who dont have a
     2.9 -desktop integrated interface. So we must think different and make change,
    2.10 -we must also keep in mind that the first installer have some crappy code
    2.11 +The first SliTaz installer uses ncurses Dialog within a SHell script. As of
    2.12 +April 2011 it is the last SliTaz home made tool which doesn't have a
    2.13 +desktop integrated interface. So we must think differently and make changes,
    2.14 +we must also keep in mind that the first installer had some crappy code
    2.15  since it was written at the start of the project.
    2.16  
    2.17 -The NEW way to think: one installer, all in SHell script and usable from the
    2.18 -cmdline without dialog or any other gui alike interface! This new installer
    2.19 +The NEW way to think: one installer, entirely in SHell script and usable from 
    2.20 +the cmdline without dialog or any other gui-like interface! This new installer
    2.21  must be able to perform an installation automatically based an a simple config
    2.22 -file wich clear variables such as: TYPE="iso|web", TARGET="/dev/hda1", USER="".
    2.23 +file with clear variables such as: TYPE="iso|web", TARGET="/dev/hda1", USER="".
    2.24  
    2.25 -This way we will be able to create different kind of frontend: Dialog, GTK and
    2.26 -CGI/web in TazPanel. The front just have to create a config file and start
    2.27 -the cmdline installer and report steps in a nice way (progess bar or/and
    2.28 +With this way, we will be able to create a different kind of frontend: Dialog, 
    2.29 +GTK and CGI/web in TazPanel. The frontend just has to create a config file and 
    2.30 +start the cmdline installer and report steps in a nice way (progess bar or/and
    2.31  messages).
    2.32  
     3.1 --- a/tazbox/tazbox	Sat Apr 30 16:11:56 2011 +0200
     3.2 +++ b/tazbox/tazbox	Sat Apr 30 16:27:52 2011 +0100
     3.3 @@ -31,7 +31,7 @@
     3.4  
     3.5  $(gettext "Commands:")
     3.6    usage      $(gettext "Display this short help usage")
     3.7 -  su         $(gettext "Execute a command a super-user")
     3.8 +  su         $(gettext "Execute a command as super-user")
     3.9    logout     $(gettext "Desktop logout box with actions")
    3.10    out        $(gettext "Pipe a command output into a GTK window")
    3.11    out-dl     $(gettext "Pipe Wget output into a GTK window")
    3.12 @@ -69,7 +69,7 @@
    3.13  	fi
    3.14  }
    3.15  
    3.16 -# Outup a command in a GTK window
    3.17 +# Output a command in a GTK window
    3.18  output_command() {	
    3.19  	yad --text-info --title="TazBox Output" --window-icon=$icon \
    3.20  		--geometry="560x210+0-24" --fore="#ffffff" --back="#000000"
    3.21 @@ -117,11 +117,11 @@
    3.22  
    3.23  # Keymap functions
    3.24  keymap_main() {
    3.25 -	text=$(gettext "Keyborad configuration")
    3.26 +	text=$(gettext "Keyboard configuration")
    3.27  	tmp=/tmp/keymap.list
    3.28  	echo > $tmp
    3.29  	cd /usr/share/kbd/keymaps/i386
    3.30 -	# We first need a list to sort and then use \n fo Yad list.
    3.31 +	# We first need a list to sort and then use \n for Yad list.
    3.32  	for i in $(find *rty *rtz dvorak -name *.map.gz)
    3.33  	do
    3.34  		keymap=$(basename $i)
    3.35 @@ -159,26 +159,26 @@
    3.36  #
    3.37  case "$1" in
    3.38  	su)
    3.39 -		# Keep command in an exported variable to be used by Yad. 4 argument
    3.40 -		# should be inuff: appname --opt --opt -v /dev/sda. Nothing to do if
    3.41 +		# Keep command in an exported variable to be used by Yad. 4 arguments
    3.42 +		# should be enuff: appname --opt --opt -v /dev/sda. Nothing to do if
    3.43  		# we are root.
    3.44  		test $(id -u) = 0 && exec $2 $3 $4 $5
    3.45  		export SU_CMD="$2 $3 $4 $5"
    3.46 -		# Check if a password have been saved before launch main dialog
    3.47 +		# Check if a password has been saved before launching main dialog
    3.48  		if [ -s $HOME/.config/slitaz/subox.conf ]; then	
    3.49  			PASSWD=$(cat $HOME/.config/slitaz/subox.conf)
    3.50  			CHECKED="TRUE"
    3.51  		fi
    3.52  		# Display the main dialog (ask for password) 
    3.53  		main=$(su_main)
    3.54 -		# Deal with --button values and exit if canceled to avoid erasing
    3.55 +		# Deal with --button values and exit if cancelled to avoid erasing
    3.56  		# saved password.
    3.57  		case $? in
    3.58  			1) exit 0 ;;
    3.59  			*) continue ;;
    3.60  		esac
    3.61  		# Save or erase Autosaved password
    3.62 -		if [ $(echo $main |cut -f2 -d"|") == "TRUE" ]; then 
    3.63 +		if [ $(echo $main | cut -f2 -d"|") == "TRUE" ]; then 
    3.64  			echo $main | cut -f 1 -d "|" > $HOME/.config/slitaz/subox.conf
    3.65  			chmod 0600 $HOME/.config/slitaz/subox.conf 
    3.66  		else
    3.67 @@ -187,7 +187,7 @@
    3.68  		# Try to login & execute. If password is wrong execute error dialog 
    3.69  		echo $main | cut -f 1 -d "|" | su -c "$SU_CMD &" || su_error ;;
    3.70  	logout)
    3.71 -		# Lougout window with actions
    3.72 +		# Logout window with actions
    3.73  		main=`logout_main`
    3.74  		# Deal with --button values
    3.75  		case $? in
    3.76 @@ -203,7 +203,7 @@
    3.77  	out)
    3.78  		# Pipe a command into a GTK window
    3.79  		output_command ;;
    3.80 -	dl-out)
    3.81 +	out-dl)
    3.82  		# A tiny GTK window for Busybox wget output
    3.83  		url=$2
    3.84  		busybox wget -c -P $DOWNLOADS $url 2>&1 | output_command