# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1364024186 -3600
# Node ID ee47159f98fb6abdea88009289863d71e5953b00
# Parent  02aae584807330215c74371deda249ede2dd31ce
Merge installer.menu and installer.cgi

diff -r 02aae5848073 -r ee47159f98fb Makefile
--- a/Makefile	Fri Mar 22 21:56:18 2013 +0100
+++ b/Makefile	Sat Mar 23 08:36:26 2013 +0100
@@ -79,7 +79,7 @@
 	mkdir -p $(DESTDIR)$(TAZPANEL)/menu.d
 	install -m 0755 installer.cgi $(DESTDIR)$(TAZPANEL)
 	@echo "Installing installer.menu into $(DESTDIR)$(TAZPANEL)/menu.d..."
-	install -m 0755 installer.menu $(DESTDIR)$(TAZPANEL)/menu.d
+	ln -s ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi
 	@echo "Installing config file into $(DESTDIR)/etc/slitaz..."
 	mkdir -p $(DESTDIR)/etc/slitaz
 	install -m 0755 etc/tazinst.conf $(DESTDIR)/etc/slitaz
diff -r 02aae5848073 -r ee47159f98fb installer.cgi
--- a/installer.cgi	Fri Mar 22 21:56:18 2013 +0100
+++ b/installer.cgi	Sat Mar 23 08:36:26 2013 +0100
@@ -40,6 +40,20 @@
 # tazinst setup file
 INSTFILE=/root/tazinst.conf
 
+#------
+# menu
+#------
+case "$0" in
+index.cgi)	cat << EOT
+<li><a href="/installer.cgi">$(gettext 'Install')</a>
+	<ul>
+		<li><a href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li>
+		<li><a href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li>
+	</ul>
+</li>
+EOT
+	exit
+esac
 
 #-----------
 # home page
diff -r 02aae5848073 -r ee47159f98fb installer.menu
--- a/installer.menu	Fri Mar 22 21:56:18 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-cat << EOT
-<li><a href="/installer.cgi">$(gettext 'Install')</a>
-	<ul>
-		<li><a href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li>
-		<li><a href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li>
-	</ul>
-</li>
-EOT