# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1335986340 -7200
# Node ID 6c8ca8c104173504d9f8617fe7925cadbca630d9
# Parent  d7f899faaffdf7f491324478b1200111d7edd6bb
tazpanel broken: down to 1.5.3

diff -r d7f899faaffd -r 6c8ca8c10417 tazpanel/receipt
--- a/tazpanel/receipt	Wed May 02 10:02:59 2012 +0200
+++ b/tazpanel/receipt	Wed May 02 21:19:00 2012 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazpanel"
-VERSION="1.5.5"
+VERSION="1.5.3"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz administration and configuration panel."
 MAINTAINER="pankso@slitaz.org"
@@ -16,8 +16,12 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src && make &&
+	cd $src # && make && 
+	  # installer.cgi fixes
+	  patch -p1 < $stuff/installer.patch || return 1
+	  make &&
 	make DESTDIR=$DESTDIR install
+
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r d7f899faaffd -r 6c8ca8c10417 tazpanel/stuff/installer.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpanel/stuff/installer.patch	Wed May 02 21:19:00 2012 +0200
@@ -0,0 +1,38 @@
+--- tazpanel-1.5.3/installer.cgi
++++ tazpanel-1.5.5/installer.cgi
+@@ -7,7 +7,7 @@
+ # Authors : Dominique Corbex <domcox@slitaz.org>
+ #
+ 
+-VERSION=0.29
++VERSION=0.30
+ 
+ # Common functions from libtazpanel
+ . lib/libtazpanel
+@@ -52,7 +52,7 @@
+ 		# Home Partition
+ 		if [ -n "$(GET HOME_SELECT)" ] ; then
+ 			TGT_HOME=$(echo "$(GET TGT_HOME)" | sed 's/\//\\\//'g)
+-			[ -n "$(GET HOME_FS)" ] && TGT_HOME_FS=$(GET HOME_FS)
++			[ -n "$(GET HOME_FMT)" ] && TGT_HOME_FS=$(GET HOME_FS) || TGT_HOME_FS=""
+ 		else
+ 			TGT_HOME=""
+ 			TGT_HOME_FS=""
+@@ -314,7 +314,7 @@
+ <a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl stable)'; return true;">$(gettext "Stable")</a>
+ <a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl cooking)'; return true;">$(gettext "Cooking")</a>
+ $(gettext "URL:")
+-<input id="url" type="url" size="55" name="SRC_WEB" value="$get_SRC_WEB" placeholder="$(gettext "Full url to an ISO image file")" />
++<input id="url" type="url" size="55" name="SRC_WEB" $([ "$INST_TYPE" == "web" ] && echo -e "value=\"$SRC_FILE\"") placeholder="$(gettext "Full url to an ISO image file")" />
+ </label>
+ </div>
+ EOT
+@@ -542,7 +542,7 @@
+ 	local code 
+ 	code=0
+ 	# Check tazinst
+-	if ! tazinst usage | grep -q Usage: ; then
++	if ! [ -x /usr/sbin/tazinst ] ; then
+ 		cat <<EOT
+ <h3>$(gettext "Tazinst Error")</h3>
+ <p><strong>tazinst</strong>, $(gettext "the lightweight SliTaz HDD installer