# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337259871 -7200
# Node ID 85543a2e118ca667479aee30f3379852c71e2556
# Parent  256ff61b724866ded5daf92a105a7f22b58a1217
spk-add: log install message

diff -r 256ff61b7248 -r 85543a2e118c README
--- a/README	Thu May 17 14:07:25 2012 +0200
+++ b/README	Thu May 17 15:04:31 2012 +0200
@@ -31,7 +31,7 @@
 LibSpk
 -------------------------------------------------------------------------------
 Libspk provides base functions and internal variables used by almost all spk-tools.
-Libspk must be installed vis 'make install-lib' to develop spk-tools.
+Libspk must be installed via 'make install-lib' to develop spk-tools.
 
 	* Source: libtaz.sh, libpkg.sh, slitaz.conf
 	* Internal Spk variables (lowercase, not configurable)
@@ -45,6 +45,7 @@
 
 	* packages.desc format: package | 1.0 | desc | category | website
 	* packages.md5 format : de9f76250657000958ee0120d376613e  package-1.0.tazpkg
+	* log package/install.log and package/up.log ti keep trace
 	* ...
 
 Since we use latest libtaz.sh, slitaz.conf and libpkg.sh code you must install
diff -r 256ff61b7248 -r 85543a2e118c lib/libspk.sh
--- a/lib/libspk.sh	Thu May 17 14:07:25 2012 +0200
+++ b/lib/libspk.sh	Thu May 17 15:04:31 2012 +0200
@@ -17,6 +17,7 @@
 pkgsmd5="${root}${PKGS_DB}/packages.$SUM"
 blocked="${root}${PKGS_DB}/blocked.list"
 activity="${root}${PKGS_DB}/activity"
+logdir="${root}/var/log/spk"
 
 #
 # Sanity checks
diff -r 256ff61b7248 -r 85543a2e118c spk-add
--- a/spk-add	Thu May 17 14:07:25 2012 +0200
+++ b/spk-add	Thu May 17 15:04:31 2012 +0200
@@ -35,6 +35,13 @@
 	exit 0
 }
 
+# Log install messages
+log_install() {
+	debug "log_install: $logdir/$pkg/install.log"
+	mkdir -p $logdir/$pkg
+	tee $logdir/$pkg/install.log
+}
+
 # Update system databases
 update_databases() {
 	if [ -f $root/usr/bin/update-desktop-database ] && [ -n "$updatedesktopdb" ]; then
@@ -90,7 +97,7 @@
 		newline
 	fi
 
-	boldify $(gettext "Installation of:") $package_name
+	boldify $(gettext "Adding"; echo " $package_name")
 	separator
 	gettext "Copying"; echo -n " $package_name..."
 	cp $package_file $tmpdir
@@ -244,8 +251,8 @@
 		updatedepmod=yes
 	fi
 	separator
-	echo -n "$package_name ({$VERSION}${EXTRAVERSION})"
-	gettext "is installed."; newline
+	echo -n "$package_name ${VERSION}${EXTRAVERSION} "
+	gettext "is installed"; newline
 	newline
 }
 
@@ -363,7 +370,7 @@
 	case "$pkg" in
 		*.tazpkg|*.spk)
 			count=$(($count + 1))
-			install_local $pkg ;;
+			install_local $pkg | log_install ;;
 		*.deb|.rmp)
 			echo "TODO: spk-convert then install" ;;
 		*.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;;
@@ -371,7 +378,7 @@
 		*)
 			[ "$forced" ] || check_installed $pkg
 			count=$(($count + 1))
-			install_web $pkg ;;
+			install_web $pkg | log_install ;;
 	esac
 done