cookutils rev 261

mv cooker web to /var/www/cooker
author Christophe Lincoln <pankso@slitaz.org>
date Tue Jun 07 12:06:02 2011 +0200 (2011-06-07)
parents 6f8dda11e26a
children 779cbebd653e
files Makefile README data/cookutils-doc.desktop doc/cookutils.en.html
line diff
     1.1 --- a/Makefile	Thu Jun 02 04:38:46 2011 +0200
     1.2 +++ b/Makefile	Tue Jun 07 12:06:02 2011 +0200
     1.3 @@ -9,15 +9,15 @@
     1.4  install:
     1.5  	install -m 0777 -d $(DESTDIR)/etc/slitaz
     1.6  	install -m 0777 -d $(DESTDIR)$(PREFIX)/bin
     1.7 -	install -m 0777 -d $(DESTDIR)/var/www/cgi-bin/cooker
     1.8 +	install -m 0777 -d $(DESTDIR)/var/www/cooker
     1.9  	install -m 0777 -d $(DESTDIR)$(PREFIX)/share/applications
    1.10  	install -m 0777 -d $(DESTDIR)$(PREFIX)/share/cook
    1.11  	install -m 0777 -d $(DESTDIR)$(PREFIX)/share/doc/cookutils
    1.12 -	install -m 0777 cook $(DESTDIR)$(PREFIX)/bin
    1.13 -	install -m 0777 cooker $(DESTDIR)$(PREFIX)/bin
    1.14 +	install -m 0755 cook $(DESTDIR)$(PREFIX)/bin
    1.15 +	install -m 0755 cooker $(DESTDIR)$(PREFIX)/bin
    1.16  	install -m 0644 cook.conf $(DESTDIR)/etc/slitaz
    1.17  	install -m 0644 cook.site $(DESTDIR)/etc/slitaz
    1.18 -	install -m 0644 web/* $(DESTDIR)/var/www/cgi-bin/cooker
    1.19 +	install -m 0644 web/* $(DESTDIR)/var/www/cooker
    1.20  	cp -r data/*.desktop $(DESTDIR)$(PREFIX)/share/applications
    1.21  	cp -r data/* $(DESTDIR)$(PREFIX)/share/cook
    1.22  	rm $(DESTDIR)$(PREFIX)/share/cook/*.desktop
    1.23 @@ -30,4 +30,4 @@
    1.24  		$(DESTDIR)$(PREFIX)/bin/cook \
    1.25  		$(DESTDIR)$(PREFIX)/bin/cooker \
    1.26  		$(DESTDIR)/etc/slitaz/cook.* \
    1.27 -		$(DESTDIR)/var/www/cgi-bin/cooker
    1.28 +		$(DESTDIR)/var/www/cooker
     2.1 --- a/README	Thu Jun 02 04:38:46 2011 +0200
     2.2 +++ b/README	Tue Jun 07 12:06:02 2011 +0200
     2.3 @@ -68,7 +68,7 @@
     2.4  is not to have a bloated script so please Keep It Short and Simple.
     2.5  
     2.6  Cmdline tool  : /usr/bin/cooker
     2.7 -Web interface : /var/www/cgi-bin/cooker
     2.8 +Web interface : /var/www/cooker
     2.9  Cache folder  : /home/slitaz/cache
    2.10  
    2.11  The web interface consists of one CGI script and one CSS style. Cook logs can
    2.12 @@ -120,10 +120,10 @@
    2.13      * Cook uses gettext for messages, not the cooker
    2.14      * If you add a feature, add also the doc to explain it
    2.15      * Use clean case with space before case end ;;
    2.16 -        case "$pkg" in
    2.17 -	      a) echo "Hello World" ;;
    2.18 -	      *) continue ;;
    2.19 -        esac
    2.20 +      case "$pkg" in
    2.21 +	    a) echo "Hello World" ;;
    2.22 +	    *) continue ;;
    2.23 +      esac
    2.24      * Make commands and options as short as possible
    2.25      * Think to log everything to help debug
    2.26      * Quote variables if used in a test: [ "$var" ]
     3.1 --- a/data/cookutils-doc.desktop	Thu Jun 02 04:38:46 2011 +0200
     3.2 +++ b/data/cookutils-doc.desktop	Tue Jun 07 12:06:02 2011 +0200
     3.3 @@ -1,6 +1,5 @@
     3.4  [Desktop Entry]
     3.5  Name=Cookutils documentation
     3.6 -Name[fr]=Manuel de Tazwok
     3.7  Exec=browser file:///usr/share/doc/cookutils/cookutils.html
     3.8  Icon=text-html
     3.9  Type=Application
     4.1 --- a/doc/cookutils.en.html	Thu Jun 02 04:38:46 2011 +0200
     4.2 +++ b/doc/cookutils.en.html	Tue Jun 07 12:06:02 2011 +0200
     4.3 @@ -30,6 +30,10 @@
     4.4  	use the same DB files and wok, they both share <a href="#blocked">blocked</a>
     4.5  	and broken packages as well as any activity.
     4.6  </p>
     4.7 +<p>
     4.8 +	For some technical informations, the coding style, please refer to the
     4.9 +	README in source tree or: /usr/share/doc/cookutils
    4.10 +</p>
    4.11  
    4.12  <h3>Cook usage</h3>
    4.13  <p>
    4.14 @@ -294,10 +298,10 @@
    4.15  <p>
    4.16  	To let you view log files in a nice way, keep trace of activity and help find
    4.17  	errors, you can use the Cooker Web interface located by default in the folder
    4.18 -	/var/www/cgi-bin/cooker. If you don't use a chroot and the Busybox httpd
    4.19 -	web server is running, the web interface will work without configuration and
    4.20 -	should be reachable at: <a href="http://localhost/cgi-bin/cooker/cooker.cgi">
    4.21 -		http://localhost/cgi-bin/cooker/cooker.cgi</a> 
    4.22 +	/var/www/cooker. If you don't use a chroot and the Busybox httpd web server
    4.23 +	is running, the web interface will work without configuration and should be
    4.24 +	reachable at: <a href="http://localhost/cooker/cooker.cgi">
    4.25 +		http://localhost/cooker/cooker.cgi</a> 
    4.26  </p>
    4.27  <p>
    4.28  	If you used a chroot environment, you should also install cookutils on your
    4.29 @@ -315,10 +319,11 @@
    4.30  </pre>
    4.31  <p>
    4.32  	Note: It's not obligatory to install the cookutils on your host to use the
    4.33 -	web interface, you can also copy the cooker.cgi and style.css files for
    4.34 -	example into your ~/Public directory and use a custom cook.conf with it. The
    4.35 -	advantage of installing cookutils on the host is to get regular updates via
    4.36 -	the Tazpkg packages manager. Say you have cloned or downloaded the cookutils:
    4.37 +	web interface. If you use Lighttpd you can also copy the cooker.cgi and
    4.38 +	style.css files for example into your ~/Public directory and use a custom
    4.39 +	cook.conf with it. The advantage of installing cookutils on the host is to
    4.40 +	get regular updates via the Tazpkg packages manager. Say you have cloned or
    4.41 +	downloaded the cookutils:
    4.42  </p>
    4.43  <pre>
    4.44  $ cp -a cookutils/web ~/Public/cgi-bin/cooker