SliTaz Repositories

     1.1 --- a/modules/block	Fri Aug 28 16:10:34 2015 +0300
     1.2 +++ b/modules/block	Fri Oct 09 13:14:01 2015 +0300
     1.3 @@ -13,75 +13,54 @@
     1.4  
     1.5  
     1.6  
     1.7 -# Log activity
     1.8 -
     1.9 -log_pkg() {
    1.10 -	[ -w "$LOG" ] &&
    1.11 -	echo "$(date +'%F %T') - $1 - $PACKAGE ($VERSION$EXTRAVERSION)" >> "$LOG"
    1.12 -}
    1.13 -
    1.14 -
    1.15 -
    1.16 +newline
    1.17 +if [ ! -d "$INSTALLED/$2" ]; then
    1.18 +	_ 'Package "%s" is not installed.' "$2"
    1.19 +	exit 1
    1.20 +fi
    1.21  
    1.22  case $1 in
    1.23  
    1.24  	block|-b)
    1.25  		# Block package
    1.26 -		newline
    1.27 -		if [ ! -d "$INSTALLED/$2" ]; then
    1.28 -			_ 'Package "%s" is not installed.' "$2"
    1.29 -			exit 1
    1.30 -		fi
    1.31  		if grep -qs "^$2" "$BLOCKED"; then
    1.32  			_ 'Package "%s" is already blocked.' "$2"
    1.33  		else
    1.34  			echo "$2" >> "$BLOCKED"
    1.35  			# Log this activity
    1.36 -			. "$INSTALLED/$2/receipt"; log_pkg Blocked
    1.37 +			. "$INSTALLED/$2/receipt"; tazpkg call log_pkg Blocked
    1.38  			_ 'Package "%s" blocked.' "$2"
    1.39  		fi
    1.40 -		newline
    1.41  		;;
    1.42  
    1.43  
    1.44  	unblock|-u)
    1.45  		# Unblock package
    1.46 -		newline
    1.47 -		if [ ! -d "$INSTALLED/$2" ]; then
    1.48 -			_ 'Package "%s" is not installed.' "$2"
    1.49 -			exit 1
    1.50 -		fi
    1.51  		if grep -qs "^$2" "$BLOCKED"; then
    1.52  			sed -i "/^$2\$/d" "$BLOCKED"
    1.53  			# Log this activity
    1.54 -			. "$INSTALLED/$2/receipt"; log_pkg Unblocked
    1.55 +			. "$INSTALLED/$2/receipt"; tazpkg call log_pkg Unblocked
    1.56  			_ 'Package "%s" unblocked.' "$2"
    1.57  		else
    1.58  			_ 'Package "%s" is not blocked.' "$2"
    1.59  		fi
    1.60 -		newline
    1.61  		;;
    1.62  
    1.63  
    1.64  	chblock)
    1.65  		# Block/unblock package
    1.66 -		newline
    1.67 -		if [ ! -d "$INSTALLED/$2" ]; then
    1.68 -			_ 'Package "%s" is not installed.' "$2"
    1.69 -			exit 1
    1.70 -		fi
    1.71  		if grep -qs "^$2" "$BLOCKED"; then
    1.72  			sed -i "/^$2\$/d" "$BLOCKED"
    1.73  			# Log this activity
    1.74 -			. "$INSTALLED/$2/receipt"; log_pkg Unblocked
    1.75 +			. "$INSTALLED/$2/receipt"; tazpkg call log_pkg Unblocked
    1.76  			_ 'Package "%s" unblocked.' "$2"
    1.77  		else
    1.78  			echo "$2" >> "$BLOCKED"
    1.79  			# Log this activity
    1.80 -			. "$INSTALLED/$2/receipt"; log_pkg Blocked
    1.81 +			. "$INSTALLED/$2/receipt"; tazpkg call log_pkg Blocked
    1.82  			_ 'Package "%s" blocked.' "$2"
    1.83  		fi
    1.84 -		newline
    1.85  		;;
    1.86  
    1.87  esac
    1.88 +newline