wok diff boxbackup-client/receipt @ rev 18699

Up firefox-official* (43.0)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Dec 16 02:02:53 2015 +0200 (2015-12-16)
parents 223b265f40fd
children 1067bb7f1e24
line diff
     1.1 --- a/boxbackup-client/receipt	Sat Sep 07 22:59:13 2013 +0000
     1.2 +++ b/boxbackup-client/receipt	Wed Dec 16 02:02:53 2015 +0200
     1.3 @@ -13,7 +13,7 @@
     1.4  
     1.5  DEPENDS="db libedit libssl perl zlib gcc-lib-base"
     1.6  
     1.7 -# Configuration variables                                                                                                    
     1.8 +# Configuration variables
     1.9  CONF_DIR="/etc/boxbackup"
    1.10  DATA_DIR="/var/lib/bbackupd"
    1.11  RUN_DMON=0
    1.12 @@ -33,7 +33,7 @@
    1.13  pre_install()
    1.14  {
    1.15  	# Stop daemon
    1.16 -	if [ -e /var/run/bbackupd.pid ]; then
    1.17 +	if [ -z "$1" -a -e /var/run/bbackupd.pid ]; then
    1.18  		/etc/init.d/bbackupd stop
    1.19  		RUN_DMON=1
    1.20  	fi
    1.21 @@ -42,13 +42,13 @@
    1.22  post_install()
    1.23  {
    1.24  	# Creating conf dir
    1.25 -	if [ ! -e $1/$CONF_DIR ]; then
    1.26 -	    mkdir -p $1/$CONF_DIR && chmod 755 $1/$CONF_DIR
    1.27 +	if [ ! -e "$1/$CONF_DIR" ]; then
    1.28 +		mkdir -p "$1/$CONF_DIR" && chmod 755 "$1/$CONF_DIR"
    1.29  	fi
    1.30 -	if [ ! -e $1/$DATA_DIR ]; then
    1.31 -	    mkdir -p $1/$DATA_DIR && chmod 700 $1/$DATA_DIR
    1.32 +	if [ ! -e "$1/$DATA_DIR" ]; then
    1.33 +	    mkdir -p "$1/$DATA_DIR" && chmod 700 "$1/$DATA_DIR"
    1.34  	fi
    1.35 -	if [ -z $1 ]; then
    1.36 +	if [ -z "$1" ]; then
    1.37  		# Start daemon (if stopped by install)
    1.38  		if [ $RUN_DMON -eq 1 ]; then
    1.39  			/etc/init.d/bbackupd start
    1.40 @@ -60,8 +60,8 @@
    1.41  
    1.42  pre_remove()
    1.43  {
    1.44 -    # Stop daemon
    1.45 -	if [ -z $1 ]; then
    1.46 +	# Stop daemon
    1.47 +	if [ -z "$1" ]; then
    1.48  		if [ -e /var/run/bbackupd.pid ]; then
    1.49  			/etc/init.d/bbackupd stop
    1.50  		fi
    1.51 @@ -71,14 +71,15 @@
    1.52  post_remove()
    1.53  {
    1.54  	# Delete DATA directory
    1.55 -	rm -rf $1/$DATA_DIR
    1.56 +	rm -rf "$1/$DATA_DIR"
    1.57  
    1.58  	# Delete Client config files
    1.59 -	rm -rf $1/$CONF_DIR/bbackupd*
    1.60 +	rm -rf "$1/$CONF_DIR"/bbackupd*
    1.61  
    1.62  	# Delete CONF dir (if empty)
    1.63  	if [ $(ls -lA $CONF_DIR | wc -l) -eq 0 ]; then
    1.64 -		echo -n "Removing $CONF_DIR..."
    1.65 +		echo
    1.66 +		action "Removing $CONF_DIR..."
    1.67  		rm -rf $1/$CONF_DIR
    1.68  		status
    1.69  	fi