wok rev 664
Fixed cups install dir (Thanks Erjo) and fix init script
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Wed Apr 23 01:01:46 2008 +0200 (2008-04-23) |
parents | 782ec3de9ca4 |
children | fb8167e6c7f5 |
files | cups/receipt cups/stuff/etc/init.d/cupsd |
line diff
1.1 --- a/cups/receipt Wed Apr 23 02:41:57 2008 +0200 1.2 +++ b/cups/receipt Wed Apr 23 01:01:46 2008 +0200 1.3 @@ -16,13 +16,13 @@ 1.4 { 1.5 cd $src 1.6 ./configure \ 1.7 - --prefix=$PWD/_pkg/usr \ 1.8 - --sysconfdir=$PWD/_pkg/etc \ 1.9 - --localstatedir=$PWD/_pkg/var \ 1.10 - --mandir=$PWD/_pkg/usr/share/man \ 1.11 + --prefix=/usr \ 1.12 + --sysconfdir=/etc \ 1.13 + --localstatedir=/var \ 1.14 + --mandir=/usr/share/man \ 1.15 $CONFIGURE_ARGS 1.16 make 1.17 - make install 1.18 + make BUILDROOT=$PWD/_pkg install 1.19 } 1.20 1.21 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- a/cups/stuff/etc/init.d/cupsd Wed Apr 23 02:41:57 2008 +0200 2.2 +++ b/cups/stuff/etc/init.d/cupsd Wed Apr 23 01:01:46 2008 +0200 2.3 @@ -15,26 +15,26 @@ 2.4 PIDFILE=/var/run/cups/cups.sock 2.5 2.6 case "$1" in 2.7 - stop) 2.8 - echo -n "Stopping $DESC: $NAME... " 2.9 - killall $DAEMON 2>/dev/null 2.10 - rm -f $PIDFILE 2.11 - status 2.12 - ;; 2.13 - start|restart) 2.14 - echo -n "Restarting $DESC: $NAME... " 2.15 - killall $DAEMON 2>/dev/null 2.16 - rm -f $PIDFILE 2.17 - sleep 2 2.18 - $DAEMON $OPTIONS 2.19 - status 2.20 - ;; 2.21 - *) 2.22 - echo "" 2.23 - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" 2.24 - echo "" 2.25 - exit 1 2.26 - ;; 2.27 + stop) 2.28 + echo -n "Stopping $DESC: $NAME... " 2.29 + killall -q cupsd 2.30 + status 2.31 + ;; 2.32 + start) 2.33 + if ps | grep $DAEMON; then 2.34 + echo "$NAME is already running... " 2.35 + exit 0 2.36 + fi 2.37 + echo -n "Starting $DESC: $NAME... " 2.38 + $DAEMON $OPTIONS 2.39 + status 2.40 + ;; 2.41 + *) 2.42 + echo "" 2.43 + echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]" 2.44 + echo "" 2.45 + exit 1 2.46 + ;; 2.47 esac 2.48 2.49 exit 0