SliTaz Repositories

     1.1 --- a/spk-add	Tue May 15 22:16:07 2012 -0500
     1.2 +++ b/spk-add	Thu May 17 08:52:38 2012 +0200
     1.3 @@ -6,10 +6,9 @@
     1.4  # Copyright (C) SliTaz GNU/Linux - BSD License
     1.5  # Author: See AUTHORS files
     1.6  #
     1.7 -#. /usr/lib/slitaz/libspk.sh
     1.8 -. lib/libspk.sh
     1.9 +. /usr/lib/slitaz/libspk.sh
    1.10  
    1.11 -tmpdir="/tmp/$RANDOM"
    1.12 +tmpdir="/tmp/spk/$RANDOM"
    1.13  
    1.14  #
    1.15  # Functions
    1.16 @@ -81,17 +80,6 @@
    1.17  		pre_depends $root
    1.18  	fi
    1.19  
    1.20 -	# Create modifiers and files.list if they do not exist
    1.21 -	# Why ? If missing files.list it's meta packages.
    1.22 -	#touch $package_dir/modifiers
    1.23 -	#touch $package_dir/files.list
    1.24 -
    1.25 -	# Add package checksum to $installed.$SUM
    1.26 -	sed -i "/ $(basename $package_dir)$/d" $installed.$SUM 2> /dev/null
    1.27 -	cd $(dirname $package_file) || exit 1
    1.28 -	$CHECKSUM $(basename $package_file) >> $installed.$SUM
    1.29 -	cd - >/dev/null
    1.30 -
    1.31  	# Resolve package deps.
    1.32  	if missing_deps $package_name $DEPENDS; then
    1.33  		install_deps $package_name $DEPENDS
    1.34 @@ -104,6 +92,13 @@
    1.35  	cp $package_file $tmpdir
    1.36  	status
    1.37  
    1.38 +	# Add package checksum to $installed.$SUM
    1.39 +	[ "$verbose" ] && gettext "Adding package to:"; \
    1.40 +		echo -n " $(basename $installed.$SUM)"
    1.41 +	sed -i "/$(basename $package_file)/"d $installed.$SUM
    1.42 +	$CHECKSUM $(basename $package_file) >> $installed.$SUM
    1.43 +	[ "$verbose" ] && status
    1.44 +
    1.45  	# Extract Package
    1.46  	cd $tmpdir || exit 1
    1.47  	rm receipt
    1.48 @@ -133,7 +128,7 @@
    1.49  		[ -d "${root}${i}" ] && continue
    1.50  		file_list="$file_list $i"
    1.51  	done
    1.52 -	
    1.53 +
    1.54  	debug "file_list is set"
    1.55  
    1.56  	# Check possibly modified files against other packages files.list
    1.57 @@ -320,7 +315,7 @@
    1.58  				if [ ! -f "$PKGS_DB/packages.list" ]; then
    1.59  					tazpkg recharge
    1.60  				fi
    1.61 -				get-install $pkg
    1.62 +				spk-add $pkg
    1.63  			fi
    1.64  		done
    1.65  	else