SliTaz Repositories

     1.1 --- a/installer/cgi/installer.cgi	Thu Aug 18 17:04:16 2011 +0200
     1.2 +++ b/installer/cgi/installer.cgi	Sat Aug 20 18:10:44 2011 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  # Authors : Dominique Corbex <domcox@slitaz.org>
     1.5  #
     1.6  
     1.7 -VERSION="0.10"
     1.8 +VERSION="0.11"
     1.9  
    1.10  # Get parameters with GET, POST and FILE functions
    1.11  . /usr/bin/httpd_helper.sh
    1.12 @@ -41,45 +41,43 @@
    1.13  write_setup()
    1.14  {
    1.15  	if [ -e "$INSTFILE" ]; then
    1.16 -		# Read vars from URL
    1.17 -		read_query_string GET
    1.18  		# Install type
    1.19 -		INST_TYPE=$GET_INST_TYPE
    1.20 +		INST_TYPE=$(GET INST_TYPE)
    1.21  		# Source File
    1.22  		case "$INST_TYPE" in
    1.23  			usb)
    1.24 -				SRC_FILE=$GET_SRC_USB ;;
    1.25 +				SRC_FILE=$(GET SRC_USB) ;;
    1.26  			iso)
    1.27 -				SRC_FILE=$GET_SRC_ISO ;;
    1.28 +				SRC_FILE=$(GET SRC_ISO) ;;
    1.29  			web)
    1.30 -				SRC_FILE=$GET_SRC_WEB ;;
    1.31 +				SRC_FILE=$(GET SRC_WEB) ;;
    1.32  		esac
    1.33  		SRC_FILE=$(echo "$SRC_FILE" | sed 's/\//\\\//'g)
    1.34 -		[ -n $GET_URL ] && SRC_WEB=$GET_URL
    1.35 +		[ -n $(GET URL) ] && SRC_WEB=$(GET URL)
    1.36  		# Main Partition
    1.37 -		TGT_PARTITION=$(echo "$GET_TGT_PARTITION" | sed 's/\//\\\//'g)
    1.38 -		[ -n "$GET_MAIN_FMT" ] && TGT_FS=$GET_MAIN_FS || TGT_FS=""
    1.39 +		TGT_PARTITION=$(echo "$(GET TGT_PARTITION)" | sed 's/\//\\\//'g)
    1.40 +		[ -n "$(GET MAIN_FMT)" ] && TGT_FS=$(GET MAIN_FS) || TGT_FS=""
    1.41  		# Home Partition
    1.42 -		if [ -n "$GET_HOME_SPLIT" ] ; then
    1.43 -			TGT_HOME=$(echo "$GET_HOME_PART" | sed 's/\//\\\//'g)
    1.44 -			[ -n "$GET_HOME_FMT" ] && TGT_HOME_FS=$GET_HOME_FS
    1.45 +		if [ -n "$(GET HOME_SPLIT)" ] ; then
    1.46 +			TGT_HOME=$(echo "$(GET HOME_PART)" | sed 's/\//\\\//'g)
    1.47 +			[ -n "$(GET HOME_FMT)" ] && TGT_HOME_FS=$(GET HOME_FS)
    1.48  		else
    1.49  			TGT_HOME=""
    1.50  			TGT_HOME_FS=""
    1.51  		fi
    1.52  		# Hostname
    1.53 -		TGT_HOSTNAME=$GET_TGT_HOSTNAME
    1.54 +		TGT_HOSTNAME=$(GET TGT_HOSTNAME)
    1.55  		# Root pwd
    1.56 -		TGT_ROOT_PWD=$GET_TGT_ROOT_PWD
    1.57 +		TGT_ROOT_PWD=$(GET TGT_ROOT_PWD)
    1.58  		# User Login
    1.59 -		TGT_USER=$GET_TGT_USER
    1.60 +		TGT_USER=$(GET TGT_USER)
    1.61  		# User Pwd
    1.62 -		TGT_USER_PWD=$GET_TGT_USER_PWD
    1.63 +		TGT_USER_PWD=$(GET TGT_USER_PWD)
    1.64  		# Grub
    1.65 -		TGT_GRUB=$GET_TGT_GRUB
    1.66 +		TGT_GRUB=$(GET TGT_GRUB)
    1.67  		[ "$TGT_GRUB" == "yes" ] || TGT_GRUB=no
    1.68  		# Win Dual-Boot
    1.69 -		TGT_WINBOOT=$GET_TGT_WINBOOT
    1.70 +		TGT_WINBOOT=$(GET TGT_WINBOOT)
    1.71  
    1.72  		# Save changes to INSTFILE
    1.73  		sed -i s/"^INST_TYPE=.*"/"INST_TYPE=\"$INST_TYPE\"/" $INSTFILE
    1.74 @@ -260,18 +258,18 @@
    1.75  	<tr>
    1.76  	<td><input type="radio" name="INST_TYPE" value="web" $([ "$INST_TYPE" == "web" ] && echo "checked" id="web") />
    1.77  	<label for="web">$(gettext "Web"):
    1.78 -	<a class="button" href="$SCRIPT_NAME?page=$GET_page&SRC_WEB=stable">$(gettext "Stable")</a>
    1.79 -	<a class="button" href="$SCRIPT_NAME?page=$GET_page&SRC_WEB=cooking">$(gettext "Cooking")</a>
    1.80 +	<a class="button" href="$SCRIPT_NAME?page=$(GET page)&SRC_WEB=stable">$(gettext "Stable")</a>
    1.81 +	<a class="button" href="$SCRIPT_NAME?page=$(GET page)&SRC_WEB=cooking">$(gettext "Cooking")</a>
    1.82  	$(gettext "URL:")</label>
    1.83  EOT
    1.84 -	case $GET_SRC_WEB in
    1.85 +	case $(GET SRC_WEB) in
    1.86  		stable|cooking)
    1.87 -			GET_SRC_WEB=$(tazinst showurl $GET_SRC_WEB) ;;
    1.88 +			get_SRC_WEB=$(tazinst showurl $(GET SRC_WEB)) ;;
    1.89  		*)
    1.90 -			[ "$INST_TYPE" == "web" ] && GET_SRC_WEB=$SRC_FILE ;;
    1.91 +			[ "$INST_TYPE" == "web" ] && get_SRC_WEB=$SRC_FILE ;;
    1.92  	esac
    1.93  cat <<EOT
    1.94 -	<input type="url" size="55" name="SRC_WEB" value="$GET_SRC_WEB" placeholder="$(gettext "Full url to an ISO image file")" /></td>
    1.95 +	<input type="url" size="55" name="SRC_WEB" value="$get_SRC_WEB" placeholder="$(gettext "Full url to an ISO image file")" /></td>
    1.96  	</tr>
    1.97  	</table>
    1.98  EOT
    1.99 @@ -523,7 +521,9 @@
   1.100  {
   1.101  	echo "<h4>$(gettext "Proceeding:")</h4>"
   1.102  	table_start
   1.103 -	tazinst $GET_INST_ACTION $INSTFILE | \
   1.104 +#	tazinst $(GET INST_ACTION) $INSTFILE | \
   1.105 +#		awk '{print "<tr><td><tt>" $0 "</tt></td></tr>"}'
   1.106 +	ping -w 3 google.com | \
   1.107  		awk '{print "<tr><td><tt>" $0 "</tt></td></tr>"}'
   1.108  	table_end
   1.109  	return $(grep -c "cancelled on error" $INSTFILE)
   1.110 @@ -564,15 +564,8 @@
   1.111  	<meta charset="utf-8" />
   1.112  	<link rel="shortcut icon" href="/styles/default/favicon.ico" />
   1.113  	<link rel="stylesheet" type="text/css" href="style.css" />
   1.114 -	<!-- Function to hide the loading message when page is generated. -->
   1.115 -	<script type="text/javascript">
   1.116 -		function showLoading(){
   1.117 -			document.getElementById("loading").style.display='none';
   1.118 -		}
   1.119 -	</script>
   1.120  </head>
   1.121 -<body onload="showLoading()"> 
   1.122 -
   1.123 +<body>
   1.124  <!-- Page content -->
   1.125  <div id="content">
   1.126  EOT
   1.127 @@ -628,13 +621,11 @@
   1.128  #
   1.129  get_config
   1.130  
   1.131 -read_query_string GET
   1.132 -
   1.133  #
   1.134  # Pages
   1.135  #
   1.136  
   1.137 -case "$GET_page" in
   1.138 +case "$(GET page)" in
   1.139  	gparted)
   1.140  		gparted
   1.141   		xhtml_header
   1.142 @@ -672,11 +663,11 @@
   1.143  		write_setup
   1.144  		xhtml_header
   1.145  		if ! (tazinst check $INSTFILE); then
   1.146 -			page_redirection $GET_INST_ACTION
   1.147 +			page_redirection $(GET INST_ACTION)
   1.148  		else
   1.149  			read_setup
   1.150  			form_start
   1.151 -			display_action $GET_INST_ACTION
   1.152 +			display_action $(GET INST_ACTION)
   1.153  			if run_tazinst; then
   1.154  				moveto_page home reboot
   1.155  			else