# HG changeset patch # User Christophe Lincoln # Date 1307441162 -7200 # Node ID 677fbd5cf708bdec05387a009d3f615b4e418f6d # Parent 6f8dda11e26a3774328b476bef852f0f881ee9fa mv cooker web to /var/www/cooker diff -r 6f8dda11e26a -r 677fbd5cf708 Makefile --- a/Makefile Thu Jun 02 04:38:46 2011 +0200 +++ b/Makefile Tue Jun 07 12:06:02 2011 +0200 @@ -9,15 +9,15 @@ install: install -m 0777 -d $(DESTDIR)/etc/slitaz install -m 0777 -d $(DESTDIR)$(PREFIX)/bin - install -m 0777 -d $(DESTDIR)/var/www/cgi-bin/cooker + install -m 0777 -d $(DESTDIR)/var/www/cooker install -m 0777 -d $(DESTDIR)$(PREFIX)/share/applications install -m 0777 -d $(DESTDIR)$(PREFIX)/share/cook install -m 0777 -d $(DESTDIR)$(PREFIX)/share/doc/cookutils - install -m 0777 cook $(DESTDIR)$(PREFIX)/bin - install -m 0777 cooker $(DESTDIR)$(PREFIX)/bin + install -m 0755 cook $(DESTDIR)$(PREFIX)/bin + install -m 0755 cooker $(DESTDIR)$(PREFIX)/bin install -m 0644 cook.conf $(DESTDIR)/etc/slitaz install -m 0644 cook.site $(DESTDIR)/etc/slitaz - install -m 0644 web/* $(DESTDIR)/var/www/cgi-bin/cooker + install -m 0644 web/* $(DESTDIR)/var/www/cooker cp -r data/*.desktop $(DESTDIR)$(PREFIX)/share/applications cp -r data/* $(DESTDIR)$(PREFIX)/share/cook rm $(DESTDIR)$(PREFIX)/share/cook/*.desktop @@ -30,4 +30,4 @@ $(DESTDIR)$(PREFIX)/bin/cook \ $(DESTDIR)$(PREFIX)/bin/cooker \ $(DESTDIR)/etc/slitaz/cook.* \ - $(DESTDIR)/var/www/cgi-bin/cooker + $(DESTDIR)/var/www/cooker diff -r 6f8dda11e26a -r 677fbd5cf708 README --- a/README Thu Jun 02 04:38:46 2011 +0200 +++ b/README Tue Jun 07 12:06:02 2011 +0200 @@ -68,7 +68,7 @@ is not to have a bloated script so please Keep It Short and Simple. Cmdline tool : /usr/bin/cooker -Web interface : /var/www/cgi-bin/cooker +Web interface : /var/www/cooker Cache folder : /home/slitaz/cache The web interface consists of one CGI script and one CSS style. Cook logs can @@ -120,10 +120,10 @@ * Cook uses gettext for messages, not the cooker * If you add a feature, add also the doc to explain it * Use clean case with space before case end ;; - case "$pkg" in - a) echo "Hello World" ;; - *) continue ;; - esac + case "$pkg" in + a) echo "Hello World" ;; + *) continue ;; + esac * Make commands and options as short as possible * Think to log everything to help debug * Quote variables if used in a test: [ "$var" ] diff -r 6f8dda11e26a -r 677fbd5cf708 data/cookutils-doc.desktop --- a/data/cookutils-doc.desktop Thu Jun 02 04:38:46 2011 +0200 +++ b/data/cookutils-doc.desktop Tue Jun 07 12:06:02 2011 +0200 @@ -1,6 +1,5 @@ [Desktop Entry] Name=Cookutils documentation -Name[fr]=Manuel de Tazwok Exec=browser file:///usr/share/doc/cookutils/cookutils.html Icon=text-html Type=Application diff -r 6f8dda11e26a -r 677fbd5cf708 doc/cookutils.en.html --- a/doc/cookutils.en.html Thu Jun 02 04:38:46 2011 +0200 +++ b/doc/cookutils.en.html Tue Jun 07 12:06:02 2011 +0200 @@ -30,6 +30,10 @@ use the same DB files and wok, they both share blocked and broken packages as well as any activity.

+

+ For some technical informations, the coding style, please refer to the + README in source tree or: /usr/share/doc/cookutils +

Cook usage

@@ -294,10 +298,10 @@

To let you view log files in a nice way, keep trace of activity and help find errors, you can use the Cooker Web interface located by default in the folder - /var/www/cgi-bin/cooker. If you don't use a chroot and the Busybox httpd - web server is running, the web interface will work without configuration and - should be reachable at: - http://localhost/cgi-bin/cooker/cooker.cgi + /var/www/cooker. If you don't use a chroot and the Busybox httpd web server + is running, the web interface will work without configuration and should be + reachable at: + http://localhost/cooker/cooker.cgi

If you used a chroot environment, you should also install cookutils on your @@ -315,10 +319,11 @@

Note: It's not obligatory to install the cookutils on your host to use the - web interface, you can also copy the cooker.cgi and style.css files for - example into your ~/Public directory and use a custom cook.conf with it. The - advantage of installing cookutils on the host is to get regular updates via - the Tazpkg packages manager. Say you have cloned or downloaded the cookutils: + web interface. If you use Lighttpd you can also copy the cooker.cgi and + style.css files for example into your ~/Public directory and use a custom + cook.conf with it. The advantage of installing cookutils on the host is to + get regular updates via the Tazpkg packages manager. Say you have cloned or + downloaded the cookutils:

 $ cp -a cookutils/web ~/Public/cgi-bin/cooker