spk rev 57

spk-add: log install message
author Christophe Lincoln <pankso@slitaz.org>
date Thu May 17 15:04:31 2012 +0200 (2012-05-17)
parents 256ff61b7248
children b88d5cb23536
files README lib/libspk.sh spk-add
line diff
     1.1 --- a/README	Thu May 17 14:07:25 2012 +0200
     1.2 +++ b/README	Thu May 17 15:04:31 2012 +0200
     1.3 @@ -31,7 +31,7 @@
     1.4  LibSpk
     1.5  -------------------------------------------------------------------------------
     1.6  Libspk provides base functions and internal variables used by almost all spk-tools.
     1.7 -Libspk must be installed vis 'make install-lib' to develop spk-tools.
     1.8 +Libspk must be installed via 'make install-lib' to develop spk-tools.
     1.9  
    1.10  	* Source: libtaz.sh, libpkg.sh, slitaz.conf
    1.11  	* Internal Spk variables (lowercase, not configurable)
    1.12 @@ -45,6 +45,7 @@
    1.13  
    1.14  	* packages.desc format: package | 1.0 | desc | category | website
    1.15  	* packages.md5 format : de9f76250657000958ee0120d376613e  package-1.0.tazpkg
    1.16 +	* log package/install.log and package/up.log ti keep trace
    1.17  	* ...
    1.18  
    1.19  Since we use latest libtaz.sh, slitaz.conf and libpkg.sh code you must install
     2.1 --- a/lib/libspk.sh	Thu May 17 14:07:25 2012 +0200
     2.2 +++ b/lib/libspk.sh	Thu May 17 15:04:31 2012 +0200
     2.3 @@ -17,6 +17,7 @@
     2.4  pkgsmd5="${root}${PKGS_DB}/packages.$SUM"
     2.5  blocked="${root}${PKGS_DB}/blocked.list"
     2.6  activity="${root}${PKGS_DB}/activity"
     2.7 +logdir="${root}/var/log/spk"
     2.8  
     2.9  #
    2.10  # Sanity checks
     3.1 --- a/spk-add	Thu May 17 14:07:25 2012 +0200
     3.2 +++ b/spk-add	Thu May 17 15:04:31 2012 +0200
     3.3 @@ -35,6 +35,13 @@
     3.4  	exit 0
     3.5  }
     3.6  
     3.7 +# Log install messages
     3.8 +log_install() {
     3.9 +	debug "log_install: $logdir/$pkg/install.log"
    3.10 +	mkdir -p $logdir/$pkg
    3.11 +	tee $logdir/$pkg/install.log
    3.12 +}
    3.13 +
    3.14  # Update system databases
    3.15  update_databases() {
    3.16  	if [ -f $root/usr/bin/update-desktop-database ] && [ -n "$updatedesktopdb" ]; then
    3.17 @@ -90,7 +97,7 @@
    3.18  		newline
    3.19  	fi
    3.20  
    3.21 -	boldify $(gettext "Installation of:") $package_name
    3.22 +	boldify $(gettext "Adding"; echo " $package_name")
    3.23  	separator
    3.24  	gettext "Copying"; echo -n " $package_name..."
    3.25  	cp $package_file $tmpdir
    3.26 @@ -244,8 +251,8 @@
    3.27  		updatedepmod=yes
    3.28  	fi
    3.29  	separator
    3.30 -	echo -n "$package_name ({$VERSION}${EXTRAVERSION})"
    3.31 -	gettext "is installed."; newline
    3.32 +	echo -n "$package_name ${VERSION}${EXTRAVERSION} "
    3.33 +	gettext "is installed"; newline
    3.34  	newline
    3.35  }
    3.36  
    3.37 @@ -363,7 +370,7 @@
    3.38  	case "$pkg" in
    3.39  		*.tazpkg|*.spk)
    3.40  			count=$(($count + 1))
    3.41 -			install_local $pkg ;;
    3.42 +			install_local $pkg | log_install ;;
    3.43  		*.deb|.rmp)
    3.44  			echo "TODO: spk-convert then install" ;;
    3.45  		*.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;;
    3.46 @@ -371,7 +378,7 @@
    3.47  		*)
    3.48  			[ "$forced" ] || check_installed $pkg
    3.49  			count=$(($count + 1))
    3.50 -			install_web $pkg ;;
    3.51 +			install_web $pkg | log_install ;;
    3.52  	esac
    3.53  done
    3.54