spk rev 31

Tiny fixes and update Makefile
author Christophe Lincoln <pankso@slitaz.org>
date Tue May 15 19:40:29 2012 +0200 (2012-05-15)
parents daf5adaaa87b
children bb5a37f13ad6
files Makefile spk spk-add
line diff
     1.1 --- a/Makefile	Tue May 15 19:35:44 2012 +0200
     1.2 +++ b/Makefile	Tue May 15 19:40:29 2012 +0200
     1.3 @@ -43,6 +43,8 @@
     1.4  	install -m 0755 spk $(DESTDIR)$(PREFIX)/bin
     1.5  	install -m 0755 spk-ls $(DESTDIR)$(PREFIX)/bin
     1.6  	install -m 0755 spk-rm $(DESTDIR)$(PREFIX)/sbin
     1.7 +	install -m 0755 spk-add $(DESTDIR)$(PREFIX)/sbin
     1.8 +	install -m 0755 spk-archive $(DESTDIR)$(PREFIX)/sbin
     1.9  
    1.10  # Clean source
    1.11  
     2.1 --- a/spk	Tue May 15 19:35:44 2012 +0200
     2.2 +++ b/spk	Tue May 15 19:40:29 2012 +0200
     2.3 @@ -6,8 +6,7 @@
     2.4  # Copyright (C) SliTaz GNU/Linux - BSD License
     2.5  # Author: See AUTHORS files
     2.6  #
     2.7 -#. /usr/lib/slitaz/libspk.sh
     2.8 -. lib/libspk.sh
     2.9 +. /usr/lib/slitaz/libspk.sh
    2.10  
    2.11  #
    2.12  # Functions
     3.1 --- a/spk-add	Tue May 15 19:35:44 2012 +0200
     3.2 +++ b/spk-add	Tue May 15 19:40:29 2012 +0200
     3.3 @@ -244,7 +244,6 @@
     3.4  # Parameters: package_file
     3.5  install_local() {
     3.6  	package_file="$1"
     3.7 -	check_root
     3.8  	check_valid_tazpkg $package_file
     3.9  
    3.10  	# Check if forced install.
    3.11 @@ -283,7 +282,7 @@
    3.12  
    3.13  	cd $CACHE_DIR > /dev/null
    3.14  	if [ -f "$package_full.tazpkg" ]; then
    3.15 -		echo -n "$(colorize "$package_full" 34) "; echo ": $CACHE_DIR)"
    3.16 +		echo -n "$(colorize "$package_full" 34)"; echo ": $CACHE_DIR)"
    3.17  		# Check package download was finished
    3.18  		if ! tail -c 2k $package_full.tazpkg | fgrep -q 00000000TRAILER; then
    3.19  			eval_gettext "Continuing \$package_name download"; newline