wok rev 14465
nconf: remove compile_rules
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Apr 27 09:10:25 2013 +0200 (2013-04-27) |
parents | 2a2adc3727af |
children | eb12af3fe895 |
files | mk-livestatus/receipt nagios/receipt nconf/receipt |
line diff
1.1 --- a/mk-livestatus/receipt Sat Apr 27 03:11:45 2013 +0200 1.2 +++ b/mk-livestatus/receipt Sat Apr 27 09:10:25 2013 +0200 1.3 @@ -15,7 +15,7 @@ 1.4 compile_rules() 1.5 { 1.6 cd $src 1.7 - ./configure && \ 1.8 + ./configure && 1.9 make && make -j1 install 1.10 } 1.11 1.12 @@ -23,8 +23,8 @@ 1.13 genpkg_rules() 1.14 { 1.15 mkdir -p $fs/usr 1.16 - cp -a $_pkg/usr/bin $fs/usr 1.17 - cp -a $_pkg/usr/lib $fs/usr 1.18 + cp -a $install/usr/bin $fs/usr 1.19 + cp -a $install/usr/lib $fs/usr 1.20 } 1.21 1.22 post_install()
2.1 --- a/nagios/receipt Sat Apr 27 03:11:45 2013 +0200 2.2 +++ b/nagios/receipt Sat Apr 27 09:10:25 2013 +0200 2.3 @@ -58,6 +58,7 @@ 2.4 mkdir -p $fs/usr $fs/etc/init.d \ 2.5 $fs/var/lib/nagios/rw \ 2.6 $fs/var/run/nagios \ 2.7 + $fs/var/log/nagios \ 2.8 $fs/var/spool/nagios/checkresults \ 2.9 $fs/etc/apache 2.10
3.1 --- a/nconf/receipt Sat Apr 27 03:11:45 2013 +0200 3.2 +++ b/nconf/receipt Sat Apr 27 09:10:25 2013 +0200 3.3 @@ -10,13 +10,6 @@ 3.4 WEB_SITE="http://www.nconf.org/dokuwiki/doku.php" 3.5 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 3.6 3.7 -# Rules to configure and make the package. 3.8 -compile_rules() 3.9 -{ 3.10 - [ -d $PACKAGE-$VERSION ] || mv $PACKAGE $PACKAGE-$VERSION 3.11 - cd $src 3.12 -} 3.13 - 3.14 # Rules to gen a SliTaz package suitable for Tazpkg. 3.15 genpkg_rules() 3.16 { 3.17 @@ -26,7 +19,7 @@ 3.18 $fs/etc/apache/conf.d \ 3.19 $fs/etc/nagios/import 3.20 3.21 - cp stuff/apache2-nconf.conf $fs/etc/apache/conf.d 3.22 + cp $stuff/apache2-nconf.conf $fs/etc/apache/conf.d 3.23 3.24 # Copy files 3.25 cp -a $src/* $fs/usr/share/nconf 3.26 @@ -96,6 +89,7 @@ 3.27 3.28 post_remove() 3.29 { 3.30 + if [ -z $1 ]; then 3.31 local db=nconf 3.32 local db_user=nconf 3.33 local db_password=nconf 3.34 @@ -115,9 +109,10 @@ 3.35 echo -n "Delete user $db_user" 3.36 mysql -Be "delete from mysql.db where user='"$db_user"'" ; status 3.37 fi 3.38 - unset $answer 3.39 + unset answer 3.40 ;; 3.41 *) 3.42 ;; 3.43 esac 3.44 + fi 3.45 }