# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337244996 -7200
# Node ID 917a909ee92b3bfcb941a156023c7379e24d2e64
# Parent  145ee647429cb57a589e29b117daaae9f90119f1
spk-add: install_deps by default if no --confirm

diff -r 145ee647429c -r 917a909ee92b lib/libspk.sh
--- a/lib/libspk.sh	Thu May 17 10:07:40 2012 +0200
+++ b/lib/libspk.sh	Thu May 17 10:56:36 2012 +0200
@@ -150,7 +150,7 @@
 		fi
 	done
 
-	gettext "Missing dependendcies:"; echo " $(colorize "$deps" 34)"
+	gettext "Missing dependencies:"; echo " $(colorize "$deps" 34)"
 
 	# Return true if missing deps
 	[ "$deps" != "0" ]
diff -r 145ee647429c -r 917a909ee92b spk-add
--- a/spk-add	Thu May 17 10:07:40 2012 +0200
+++ b/spk-add	Thu May 17 10:56:36 2012 +0200
@@ -7,6 +7,7 @@
 # Author: See AUTHORS files
 #
 . /usr/lib/slitaz/libspk.sh
+#. lib/libspk.sh
 
 tmpdir="/tmp/spk/$RANDOM"
 
@@ -82,10 +83,20 @@
 
 	# Resolve package deps.
 	if missing_deps $package_name $DEPENDS; then
-		install_deps $package_name $DEPENDS
+		if [ "$confirm" ]; then
+			gettext "Install missing dependencies"
+			if ! confirm; then
+				gettext "WARNING: Any dependencies installed"; newline
+			else
+				install_deps $package_name $DEPENDS
+			fi
+		else
+			install_deps $package_name $DEPENDS
+		fi
+	else
+		newline
 	fi
 
-	newline
 	boldify $(gettext "Installation of:") $package_name
 	separator
 	gettext "Copying"; echo -n " $package_name..."
@@ -93,9 +104,10 @@
 	status
 
 	# Add package checksum to $installed.$SUM
-	[ "$verbose" ] && gettext "Adding package to:"; \
-		echo -n " $(basename $installed.$SUM)"
-	sed -i "/$(basename $package_file)/"d $installed.$SUM
+	if [ "$verbose" ]; then
+		gettext "Incrementing:"; echo -n " $(basename $installed.$SUM)"
+	fi
+	sed -i "/$(basename $package_file)/"d $installed.$SUM 2>/dev/null
 	$CHECKSUM $(basename $package_file) >> $installed.$SUM
 	[ "$verbose" ] && status
 
@@ -275,7 +287,7 @@
 		gettext "Using cache:"; echo " $(colorize "$package_full" 34)"
 		# Check package download was finished
 		if ! tail -c 2k $package_full.tazpkg | fgrep -q 00000000TRAILER; then
-			eval_gettext "Continuing \$package_name download"; newline
+			gettext "Continuing download of:"; echo " $package_name"
 			download "$package_full.tazpkg"
 		fi
 		# Check that the package has the correct checksum
@@ -284,46 +296,33 @@
 		#	download "$package_full.tazpkg"
 		#fi
 	else
-		newline
-		download "$package_full.tazpkg"
+		newline && download "$package_full.tazpkg"
 	fi
 
 	install_package "$CACHE_DIR/$package_full.tazpkg"
 
-	[ -n "$AUTOEXEC" ] && $package_name $root
+	#[ "$AUTOEXEC" ] && chroot $root/ $package_name
+	[ "$AUTOEXEC" ] && $package_name $root
 	update_databases
 }
 
-# Install all missing deps. Auto install or ask user then install all missing
-# deps from local dir, cdrom, media or from the mirror. In case we want to
-# install packages from local, we need a packages.list to find the version.
-# Parameters: package List of deps to install
+# Install all missing deps of a package.
+# Usage: install_deps package DEPENDS
 install_deps() {
 	local package=$1
 	shift
 	local deps="$@"
-
-	gettext "Install all missing dependencies? "
-
-	# Print Yes/No and get result
-	if $AUTO_INSTALL_DEPS || confirm; then
-		for pkgorg in $deps; do
-			local pkg=$(equivalent_pkg $pkgorg)
-			# Check if package is not installed
-			if [ ! -d "$installed/$pkg" ]; then
-				if [ ! -f "$PKGS_DB/packages.list" ]; then
-					tazpkg recharge
-				fi
-				spk-add $pkg
+	for pkgorg in $deps; do
+		local pkg=$(equivalent_pkg $pkgorg)
+		# Check if package is not installed
+		if [ ! -d "$installed/$pkg" ]; then
+			if [ ! -f "$PKGS_DB/packages.list" ]; then
+				#spk-up --recharge-only
+				tazpkg recharge
 			fi
-		done
-	else
-		newline
-		boldify $(gettext "Package:") $package
-		gettext \
-			"Dependencies unresolved. Installed but will probably not work."
-		newline && newline
-	fi
+			spk-add $pkg
+		fi
+	done
 }
 
 #
diff -r 145ee647429c -r 917a909ee92b spk-rm
--- a/spk-rm	Thu May 17 10:07:40 2012 +0200
+++ b/spk-rm	Thu May 17 10:56:36 2012 +0200
@@ -113,7 +113,7 @@
 	sed -i "/$PACKAGE-${VERSION}${EXTRAVERSION}.tazpkg/"d $installed.$SUM
 	status
 
-	separator && newline
+	separator
 
 	# Do we have packages depending on $pkg to remove ?
 	if [ "$altered" ]; then
@@ -129,6 +129,8 @@
 				spk-rm $i --root=$root
 			fi
 		done
+	else
+		newline
 	fi
 }