# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337237558 -7200
# Node ID e7b29fd4da64a277abfd544475c3ef4d8fb771b2
# Parent  6cc8c13c4ab446e3c57e9fb0e4b8bbed632ef003
spk-add: some morning fixes

diff -r 6cc8c13c4ab4 -r e7b29fd4da64 lib/libspk.sh
--- a/lib/libspk.sh	Wed May 16 16:54:42 2012 +0200
+++ b/lib/libspk.sh	Thu May 17 08:52:38 2012 +0200
@@ -79,6 +79,10 @@
 			echo "${mirror%/}/$package"
 			wget -c ${mirror%/}/$package ;;
 	esac
+	if [ ! -f "$package" ]; then
+		echo "ERROR: Missing package $package"
+		exit 1
+	fi
 }
 
 # Assume package name is valid
diff -r 6cc8c13c4ab4 -r e7b29fd4da64 spk-add
--- a/spk-add	Wed May 16 16:54:42 2012 +0200
+++ b/spk-add	Thu May 17 08:52:38 2012 +0200
@@ -6,10 +6,9 @@
 # Copyright (C) SliTaz GNU/Linux - BSD License
 # Author: See AUTHORS files
 #
-#. /usr/lib/slitaz/libspk.sh
-. lib/libspk.sh
+. /usr/lib/slitaz/libspk.sh
 
-tmpdir="/tmp/$RANDOM"
+tmpdir="/tmp/spk/$RANDOM"
 
 #
 # Functions
@@ -81,17 +80,6 @@
 		pre_depends $root
 	fi
 
-	# Create modifiers and files.list if they do not exist
-	# Why ? If missing files.list it's meta packages.
-	#touch $package_dir/modifiers
-	#touch $package_dir/files.list
-
-	# Add package checksum to $installed.$SUM
-	sed -i "/ $(basename $package_dir)$/d" $installed.$SUM 2> /dev/null
-	cd $(dirname $package_file) || exit 1
-	$CHECKSUM $(basename $package_file) >> $installed.$SUM
-	cd - >/dev/null
-
 	# Resolve package deps.
 	if missing_deps $package_name $DEPENDS; then
 		install_deps $package_name $DEPENDS
@@ -104,6 +92,13 @@
 	cp $package_file $tmpdir
 	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
+	$CHECKSUM $(basename $package_file) >> $installed.$SUM
+	[ "$verbose" ] && status
+
 	# Extract Package
 	cd $tmpdir || exit 1
 	rm receipt
@@ -133,7 +128,7 @@
 		[ -d "${root}${i}" ] && continue
 		file_list="$file_list $i"
 	done
-	
+
 	debug "file_list is set"
 
 	# Check possibly modified files against other packages files.list
@@ -320,7 +315,7 @@
 				if [ ! -f "$PKGS_DB/packages.list" ]; then
 					tazpkg recharge
 				fi
-				get-install $pkg
+				spk-add $pkg
 			fi
 		done
 	else