wok diff nconf/receipt @ rev 14625
Up: aalib to 1.4rc5.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sat Jun 01 10:26:00 2013 +0000 (2013-06-01) |
parents | 066baa4a3634 |
children | 3765f181a6d5 |
line diff
1.1 --- a/nconf/receipt Sat Apr 27 02:48:04 2013 +0200 1.2 +++ b/nconf/receipt Sat Jun 01 10:26:00 2013 +0000 1.3 @@ -10,13 +10,6 @@ 1.4 WEB_SITE="http://www.nconf.org/dokuwiki/doku.php" 1.5 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 1.6 1.7 -# Rules to configure and make the package. 1.8 -compile_rules() 1.9 -{ 1.10 - [ -d $PACKAGE-$VERSION ] || mv $PACKAGE $PACKAGE-$VERSION 1.11 - cd $src 1.12 -} 1.13 - 1.14 # Rules to gen a SliTaz package suitable for Tazpkg. 1.15 genpkg_rules() 1.16 { 1.17 @@ -26,7 +19,7 @@ 1.18 $fs/etc/apache/conf.d \ 1.19 $fs/etc/nagios/import 1.20 1.21 - cp stuff/apache2-nconf.conf $fs/etc/apache/conf.d 1.22 + cp $stuff/apache2-nconf.conf $fs/etc/apache/conf.d 1.23 1.24 # Copy files 1.25 cp -a $src/* $fs/usr/share/nconf 1.26 @@ -96,6 +89,7 @@ 1.27 1.28 post_remove() 1.29 { 1.30 + if [ -z $1 ]; then 1.31 local db=nconf 1.32 local db_user=nconf 1.33 local db_password=nconf 1.34 @@ -115,9 +109,10 @@ 1.35 echo -n "Delete user $db_user" 1.36 mysql -Be "delete from mysql.db where user='"$db_user"'" ; status 1.37 fi 1.38 - unset $answer 1.39 + unset answer 1.40 ;; 1.41 *) 1.42 ;; 1.43 esac 1.44 + fi 1.45 }