# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337871655 -7200
# Node ID 3f204d3bf901f41f7187e005dee7c792d23aab4d
# Parent  a75380e9a681ed5d4a793f4b0df8a169bebfdb14
Small fixes and improvments to add, mirror and libspk.sh

diff -r a75380e9a681 -r 3f204d3bf901 Makefile
--- a/Makefile	Wed May 23 21:31:14 2012 +0000
+++ b/Makefile	Thu May 24 17:00:55 2012 +0200
@@ -45,6 +45,7 @@
 	install -m 0755 spk-rm $(DESTDIR)$(PREFIX)/sbin
 	install -m 0755 spk-add $(DESTDIR)$(PREFIX)/sbin
 	install -m 0755 spk-mirror $(DESTDIR)$(PREFIX)/sbin
+	install -m 0755 spk-up $(DESTDIR)$(PREFIX)/sbin
 
 # Clean source
 
diff -r a75380e9a681 -r 3f204d3bf901 lib/libspk.sh
--- a/lib/libspk.sh	Wed May 23 21:31:14 2012 +0000
+++ b/lib/libspk.sh	Thu May 24 17:00:55 2012 +0200
@@ -17,6 +17,7 @@
 pkgsdesc="${root}${PKGS_DB}/packages.desc"
 pkgsmd5="${root}${PKGS_DB}/packages.$SUM"
 pkgsequiv="${root}${PKGS_DB}/packages.equiv"
+pkgsup="${root}${PKGS_DB}/packages.up"
 blocked="${root}${PKGS_DB}/blocked.list"
 activity="${root}${PKGS_DB}/activity"
 logdir="${root}/var/log/spk"
@@ -32,6 +33,10 @@
 	exit 1
 fi
 
+if [ ! -d "${root}${extradb}" ]; then
+	mkdir -p ${root}${extradb}
+fi
+
 #
 # Functions
 #
diff -r a75380e9a681 -r 3f204d3bf901 spk-add
--- a/spk-add	Wed May 23 21:31:14 2012 +0000
+++ b/spk-add	Thu May 24 17:00:55 2012 +0200
@@ -103,7 +103,7 @@
 	if [ "$verbose" ]; then
 		gettext "Incrementing:"; echo -n " $(basename $installed.$SUM)"
 	fi
-	sed -i "/$(basename $package_file)/"d $installed.$SUM 2>/dev/null
+	sed -i "/  $PACKAGE-$VERSION*/"d $installed.$SUM 2>/dev/null
 	$CHECKSUM $(basename $package_file) >> $installed.$SUM
 	[ "$verbose" ] && status
 
@@ -111,7 +111,7 @@
 	rm $tmpdir/receipt
 
 	# Extract Package
-	debug "extract_package $package_file $tmpdir"
+	#debug "extract_package $package_file $tmpdir"
 	extract_package $package_file $tmpdir
 	tmpdir="$tmpdir/$PACKAGE-$VERSION"
 
@@ -339,8 +339,7 @@
 		# Check if package is not installed
 		if [ ! -d "$installed/$pkg" ]; then
 			if [ ! -f "$pkgsdesc" ]; then
-				#spk-up --list
-				tazpkg recharge
+				spk-up --list
 			fi
 			spk-add $pkg
 		fi
diff -r a75380e9a681 -r 3f204d3bf901 spk-mirror
--- a/spk-mirror	Wed May 23 21:31:14 2012 +0000
+++ b/spk-mirror	Thu May 24 17:00:55 2012 +0200
@@ -269,7 +269,7 @@
 				echo "$pkgsdir/" > $db/mirror
 				for list in packages.*
 				do
-					echo $(gettext "Linking:") $list
+					echo -n $(gettext "Linking:") $list
 					ln -s $pkgsdir/$list $db/$list
 					status
 				done