SliTaz Repositories

     1.1 --- a/lib/libspk.sh	Tue Sep 18 22:21:11 2012 +0200
     1.2 +++ b/lib/libspk.sh	Thu Dec 20 13:31:21 2012 +0000
     1.3 @@ -322,3 +322,16 @@
     1.4  is_elf() {
     1.5  	[ "$(dd if=$1 bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ]
     1.6  }
     1.7 +
     1.8 +# Avoid dirname errors by checking for argument and then remove file and
     1.9 +# empty directory. Usage: remove_file file
    1.10 +remove_file() {
    1.11 +	[ "$1" ] || return
    1.12 +	local dir
    1.13 +	rm -f $1 2>/dev/null
    1.14 +	dir="$1"
    1.15 +	while [ "$dir" != "/" ]; do
    1.16 +		dir="$(dirname $dir)"
    1.17 +		rmdir $dir 2> /dev/null || break
    1.18 +	done
    1.19 +}

     2.1 --- a/spk-rm	Tue Sep 18 22:21:11 2012 +0200
     2.2 +++ b/spk-rm	Thu Dec 20 13:31:21 2012 +0000
     2.3 @@ -34,19 +34,6 @@
     2.4  	exit 0
     2.5  }
     2.6  
     2.7 -# Avoid dirname errors by checking for argument and then remove file and
     2.8 -# empty directory. Usage: remove_file file
     2.9 -remove_file() {
    2.10 -	[ "$1" ] || return
    2.11 -	local dir
    2.12 -	rm -f $1 2>/dev/null
    2.13 -	dir="$1"
    2.14 -	while [ "$dir" != "/" ]; do
    2.15 -		dir="$(dirname $dir)"
    2.16 -		rmdir $dir 2> /dev/null || break
    2.17 -	done
    2.18 -}
    2.19 -
    2.20  # Remove a single package
    2.21  remove() {
    2.22  	local altered