# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337303991 -7200
# Node ID fb6acdd2617c5118be98ffc6f644141f1920749f
# Parent  d0fa46ea46bd7c77452fafe12c4b3dcc2cf64f9d
spk-archive: be busybox ash compatible

diff -r d0fa46ea46bd -r fb6acdd2617c spk-archive
--- a/spk-archive	Fri May 18 03:09:37 2012 +0200
+++ b/spk-archive	Fri May 18 03:19:51 2012 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Spk-Archive - SliTaz Package Archive Manager
 #
@@ -15,13 +15,13 @@
 $(boldify $(gettext "Usage:")) $name [command] package
 
 $(boldify $(gettext "Commands:"))
-	pack
-	repack [--config]
-	extract
-	recompress
+  pack
+  repack [--config]
+  extract
+  recompress
 
 $(boldify "$(gettext "Example:")")
-  $name extract clex
+  $name extract package
 
 EOT
 	exit 0
@@ -33,13 +33,13 @@
 	local package_file=$1
 	local package_name=$(package_name $package_file)
 
-	eval_gettext "Extracting \$package_name... "
+	gettext "Extracting:"; echo " $package_name... "
 	cpio -idm --quiet < ${package_file##*/} && rm -f ${package_file##*/}
 	status
 
-	gettext "Extracting the pseudo fs... "
+	[ "$verbose" ] && gettext "Extracting the pseudo fs... "
 	unlzma -c fs.cpio.lzma | cpio -idm --quiet && rm fs.cpio.lzma
-	status
+	[ "$verbose" ] && status
 }
 
 # Extract .tazpkg cpio archive into a directory.
@@ -48,10 +48,10 @@
 	local package_file=$1
 	local target_dir=$2
 
-	# validate the file
+	# Validate the file
 	check_valid_tazpkg $package_file
 
-	# find the package name
+	# Find the package name
 	local package_name=$(package_name $package_file)
 
 	# Create destination directory
@@ -66,11 +66,12 @@
 	gettext "Copying original package..."
 	cp $package_file $dest_dir
 	status
-	pushd $dest_dir > /dev/null
-		extract_package $package $package_file
-	popd > /dev/null
+	cd $dest_dir
+	extract_package $package $package_file
+	cd - > /dev/null
 	separator
-	eval_gettext "\$package_name is extracted to: \$dest_dir"; newline
+	echo -n "$package_name"
+	gettext "is extracted to:"; echo " $dest_dir"
 	newline
 }
 
@@ -92,16 +93,15 @@
 	cp $package_file $TMP_DIR
 	status
 
-	pushd $TMP_DIR > /dev/null
-		extract_package $package_file
+	cd $TMP_DIR
+	extract_package $package_file
+	gettext "Recompressing the fs..."
+	find fs | cpio -o -H newc --quiet | lzma e fs.cpio.lzma -si
+	rm -rf fs
+	status
+	cd - > /dev/null
 
-		gettext "Recompressing the fs... "
-		find fs | cpio -o -H newc --quiet | lzma e fs.cpio.lzma -si
-		rm -rf fs
-		status
-	popd > /dev/null
-
-	gettext "Creating new package... "
+	gettext "Creating new package..."
 	find $TMP_DIR -print | cpio -o -H newc --quiet > \
 		$(basename $package_file).$$ && mv -f \
 		$(basename $package_file).$$ \