# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337290823 -7200
# Node ID 17ac0766776763482865f7fe6e2e2ca10e3654fb
# Parent  c14dd480d1d4102da0ea48bf235a9b559259cec2
Bunch of improvment, new extract_fileslist function in libspk.sh

diff -r c14dd480d1d4 -r 17ac07667767 README
--- a/README	Thu May 17 20:05:16 2012 +0200
+++ b/README	Thu May 17 23:40:23 2012 +0200
@@ -25,7 +25,7 @@
 	* spk-up     : Upgrade the whole system
 	* spk-search : Search for packages or files
 	* spk-archive: Manage package extraction, compression, and packing
-	* spk-mirror : Manage mirrors and undigest
+	* spk-mirror : Manage official and extra mirrors
 
 
 LibSpk
diff -r c14dd480d1d4 -r 17ac07667767 lib/libspk.sh
--- a/lib/libspk.sh	Thu May 17 20:05:16 2012 +0200
+++ b/lib/libspk.sh	Thu May 17 23:40:23 2012 +0200
@@ -16,10 +16,12 @@
 installed="${root}${PKGS_DB}/installed"
 pkgsdesc="${root}${PKGS_DB}/packages.desc"
 pkgsmd5="${root}${PKGS_DB}/packages.$SUM"
+pkgsequiv="${root}${PKGS_DB}/packages.equiv"
 blocked="${root}${PKGS_DB}/blocked.list"
 activity="${root}${PKGS_DB}/activity"
 logdir="${root}/var/log/spk"
 extradb="${root}${PKGS_DB}/extra"
+tmpdir="/tmp/spk/$RANDOM"
 
 #
 # Sanity checks
@@ -48,22 +50,31 @@
 extract_receipt() {
 	local dir="$1"
 	local file="$2"
-	debug "extract_receipt $1 $2"
 	cd "$dir"
 	{ cpio --quiet -i receipt > /dev/null 2>&1; } < $file
 	cd - >/dev/null
 }
 
+# Extract files.list from tazpkg
+# Parameters: result_dir package_file
+extract_fileslist() {
+	local dir="$1"
+	local file="$2"
+	cd "$dir"
+	{ cpio --quiet -i files.list > /dev/null 2>&1; } < $file
+	cd - >/dev/null
+}
+
 # Used by: list
 count_installed() {
 	local count=$(ls $installed | wc -l)
-	gettext "Installed  :"; echo " $count"
+	gettext "Installed     :"; echo " $count"
 }
 
 # Used by: list
 count_mirrored() {
 	local count=$(cat $pkgsmd5 | wc -l)
-	gettext "Mirrored   :"; echo " $count"
+	gettext "Mirrored      :"; echo " $count"
 }
 
 is_package_mirrored() {
@@ -109,8 +120,8 @@
 
 # get an already installed package from packages.equiv  TODO REDO!
 equivalent_pkg() {
-	for i in $(grep -hs "^$1=" ${root}${PKGS_DB}/packages.equiv \
-		   ${root}${PKGS_DB}/undigest/*/packages.equiv | sed "s/^$1=//")
+	for i in $(grep -hs "^$1=" $pkgsequiv \
+		$extradb/*/packages.equiv | sed "s/^$1=//")
 	do
 		if echo $i | fgrep -q : ; then
 			# format 'alternative:newname'
diff -r c14dd480d1d4 -r 17ac07667767 spk
--- a/spk	Thu May 17 20:05:16 2012 +0200
+++ b/spk	Thu May 17 23:40:23 2012 +0200
@@ -49,12 +49,15 @@
 	""|*usage|*help) usage ;;
 	info)
 		cache="$(du -sh $CACHE_DIR | awk '{print $1 " " $2}')"
+		extra=$(ls $extradb | wc -l)
 		newline
 		boldify "Spk info"
 		separator
-		gettext "Database   :"; echo " $installed"
-		gettext "Cache info :"; echo " $cache"
-		gettext "Mirror URL :"; echo " $(cat $mirrorurl)"
+		gettext "Architecture  :"; echo " $SLITAZ_ARCH"
+		gettext "Database      :"; echo " $installed"
+		gettext "Cache info    :"; echo " $cache"
+		gettext "Mirror URL    :"; echo " $(cat $mirrorurl)"
+		gettext "Extra mirrors :"; echo " $extra"
 		count_installed
 		count_mirrored
 		separator
diff -r c14dd480d1d4 -r 17ac07667767 spk-add
--- a/spk-add	Thu May 17 20:05:16 2012 +0200
+++ b/spk-add	Thu May 17 23:40:23 2012 +0200
@@ -8,8 +8,6 @@
 #
 . /usr/lib/slitaz/libspk.sh
 
-tmpdir="/tmp/spk/$RANDOM"
-
 #
 # Functions
 #