wok-current diff couchdb/receipt @ rev 18730

Quote root dir in post_install
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Dec 20 15:13:45 2015 +0100 (2015-12-20)
parents dfef8de3d270
children d6ca18366f41
line diff
     1.1 --- a/couchdb/receipt	Fri Jan 30 10:17:37 2015 +0100
     1.2 +++ b/couchdb/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.3 @@ -53,7 +53,7 @@
     1.4  {
     1.5  	INIT_FILE="/etc/init.d/$PACKAGE"
     1.6  	echo "Processing pre-install commands..."
     1.7 -	[ -f $1$$INIT_FILE ] && chroot "$1/" $INIT_FILE stop
     1.8 +	[ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop
     1.9  	echo "Done..."
    1.10  }
    1.11  
    1.12 @@ -68,9 +68,9 @@
    1.13  
    1.14  	echo "Processing post-install commands..."
    1.15  
    1.16 -	grep -q "$PACKAGE" $1/etc/group || chroot "$1/" addgroup -S $PACKAGE
    1.17 +	grep -q "$PACKAGE" "$1/etc/group" || chroot "$1/" addgroup -S $PACKAGE
    1.18  
    1.19 -	grep -q "$PACKAGE" $1/etc/passwd || chroot "$1/" adduser -S -D -H \
    1.20 +	grep -q "$PACKAGE" "$1/etc/passwd" || chroot "$1/" adduser -S -D -H \
    1.21  	  -h $LIBDIR -G $PACKAGE -s /bin/sh -g "CouchDB Administrator" $PACKAGE
    1.22  
    1.23  	for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do
    1.24 @@ -86,7 +86,7 @@
    1.25  {
    1.26  	INIT_FILE="/etc/init.d/$PACKAGE"
    1.27  	echo "Processing pre-remove commands..."
    1.28 -	[ -f $1$INIT_FILE ] && chroot "$1/" $INIT_FILE stop
    1.29 +	[ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop
    1.30  	echo "Done..."
    1.31  }
    1.32  
    1.33 @@ -102,7 +102,7 @@
    1.34  	chroot "$1/" deluser $PACKAGE
    1.35  
    1.36  	for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do
    1.37 -		rm -rf $1$DIR
    1.38 +		rm -rf "$1$DIR"
    1.39  	done
    1.40  
    1.41  	echo "Done..."