tazinst rev 9
Merge installer.menu and installer.cgi
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Mar 23 08:36:26 2013 +0100 (2013-03-23) |
parents | 02aae5848073 |
children | 1dbbd8b962e3 |
files | Makefile installer.cgi installer.menu |
line diff
1.1 --- a/Makefile Fri Mar 22 21:56:18 2013 +0100 1.2 +++ b/Makefile Sat Mar 23 08:36:26 2013 +0100 1.3 @@ -79,7 +79,7 @@ 1.4 mkdir -p $(DESTDIR)$(TAZPANEL)/menu.d 1.5 install -m 0755 installer.cgi $(DESTDIR)$(TAZPANEL) 1.6 @echo "Installing installer.menu into $(DESTDIR)$(TAZPANEL)/menu.d..." 1.7 - install -m 0755 installer.menu $(DESTDIR)$(TAZPANEL)/menu.d 1.8 + ln -s ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi 1.9 @echo "Installing config file into $(DESTDIR)/etc/slitaz..." 1.10 mkdir -p $(DESTDIR)/etc/slitaz 1.11 install -m 0755 etc/tazinst.conf $(DESTDIR)/etc/slitaz
2.1 --- a/installer.cgi Fri Mar 22 21:56:18 2013 +0100 2.2 +++ b/installer.cgi Sat Mar 23 08:36:26 2013 +0100 2.3 @@ -40,6 +40,20 @@ 2.4 # tazinst setup file 2.5 INSTFILE=/root/tazinst.conf 2.6 2.7 +#------ 2.8 +# menu 2.9 +#------ 2.10 +case "$0" in 2.11 +index.cgi) cat << EOT 2.12 +<li><a href="/installer.cgi">$(gettext 'Install')</a> 2.13 + <ul> 2.14 + <li><a href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li> 2.15 + <li><a href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li> 2.16 + </ul> 2.17 +</li> 2.18 +EOT 2.19 + exit 2.20 +esac 2.21 2.22 #----------- 2.23 # home page
3.1 --- a/installer.menu Fri Mar 22 21:56:18 2013 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,8 +0,0 @@ 3.4 -cat << EOT 3.5 -<li><a href="/installer.cgi">$(gettext 'Install')</a> 3.6 - <ul> 3.7 - <li><a href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li> 3.8 - <li><a href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li> 3.9 - </ul> 3.10 -</li> 3.11 -EOT