tazpkg rev 916

Restore AUTO_INSTALL_DEPS behaviour
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Aug 01 16:25:14 2016 +0200 (2016-08-01)
parents 169627386f16
children 4ebc99c81b41
files modules/install modules/remove
line diff
     1.1 --- a/modules/install	Mon Jul 25 11:21:49 2016 +0200
     1.2 +++ b/modules/install	Mon Aug 01 16:25:14 2016 +0200
     1.3 @@ -128,13 +128,11 @@
     1.4  		"$num")"
     1.5  
     1.6  
     1.7 -	if [ -n "$quiet" ]; then
     1.8 +	if [ "$AUTO_INSTALL_DEPS" == 'yes' ] || [ -n "$quiet" ]; then
     1.9  		# Quietly not display anything. Assume 'yes' unless '--noconfirm' is provided
    1.10  		answer=0
    1.11  		[ -n "$noconfirm" ] && answer=1
    1.12  	else
    1.13 -		[ "$AUTO_INSTALL_DEPS" == 'yes' ] && yes='yes'
    1.14 -
    1.15  		# Display question; wait for answer or print auto-answer
    1.16  		newline
    1.17  		confirm "$(_ 'Install all missing dependencies? (y/N)')"
     2.1 --- a/modules/remove	Mon Jul 25 11:21:49 2016 +0200
     2.2 +++ b/modules/remove	Mon Aug 01 16:25:14 2016 +0200
     2.3 @@ -123,7 +123,7 @@
     2.4  fi
     2.5  
     2.6  # Confirmation
     2.7 -if [ -n "$noconfirm$yes" ] || im && [ -z "$auto" ]; then
     2.8 +if [ -n "$noconfirm" ] || im && [ -z "$auto" ]; then
     2.9  	confirm "$(_ 'Remove package "%s" (%s)? (y/N)' "$PACKAGE" "$VERSION$EXTRAVERSION")"
    2.10  	if [ "$?" -ne 0 ]; then
    2.11  		newline; _ 'Uninstallation of package "%s" cancelled.' "$PACKAGE"