SliTaz Repositories

     1.1 --- a/lib/libspk.sh	Wed May 16 16:54:42 2012 +0200
     1.2 +++ b/lib/libspk.sh	Thu May 17 08:52:38 2012 +0200
     1.3 @@ -79,6 +79,10 @@
     1.4  			echo "${mirror%/}/$package"
     1.5  			wget -c ${mirror%/}/$package ;;
     1.6  	esac
     1.7 +	if [ ! -f "$package" ]; then
     1.8 +		echo "ERROR: Missing package $package"
     1.9 +		exit 1
    1.10 +	fi
    1.11  }
    1.12  
    1.13  # Assume package name is valid

     2.1 --- a/spk-add	Wed May 16 16:54:42 2012 +0200
     2.2 +++ b/spk-add	Thu May 17 08:52:38 2012 +0200
     2.3 @@ -6,10 +6,9 @@
     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 -tmpdir="/tmp/$RANDOM"
    2.12 +tmpdir="/tmp/spk/$RANDOM"
    2.13  
    2.14  #
    2.15  # Functions
    2.16 @@ -81,17 +80,6 @@
    2.17  		pre_depends $root
    2.18  	fi
    2.19  
    2.20 -	# Create modifiers and files.list if they do not exist
    2.21 -	# Why ? If missing files.list it's meta packages.
    2.22 -	#touch $package_dir/modifiers
    2.23 -	#touch $package_dir/files.list
    2.24 -
    2.25 -	# Add package checksum to $installed.$SUM
    2.26 -	sed -i "/ $(basename $package_dir)$/d" $installed.$SUM 2> /dev/null
    2.27 -	cd $(dirname $package_file) || exit 1
    2.28 -	$CHECKSUM $(basename $package_file) >> $installed.$SUM
    2.29 -	cd - >/dev/null
    2.30 -
    2.31  	# Resolve package deps.
    2.32  	if missing_deps $package_name $DEPENDS; then
    2.33  		install_deps $package_name $DEPENDS
    2.34 @@ -104,6 +92,13 @@
    2.35  	cp $package_file $tmpdir
    2.36  	status
    2.37  
    2.38 +	# Add package checksum to $installed.$SUM
    2.39 +	[ "$verbose" ] && gettext "Adding package to:"; \
    2.40 +		echo -n " $(basename $installed.$SUM)"
    2.41 +	sed -i "/$(basename $package_file)/"d $installed.$SUM
    2.42 +	$CHECKSUM $(basename $package_file) >> $installed.$SUM
    2.43 +	[ "$verbose" ] && status
    2.44 +
    2.45  	# Extract Package
    2.46  	cd $tmpdir || exit 1
    2.47  	rm receipt
    2.48 @@ -133,7 +128,7 @@
    2.49  		[ -d "${root}${i}" ] && continue
    2.50  		file_list="$file_list $i"
    2.51  	done
    2.52 -	
    2.53 +
    2.54  	debug "file_list is set"
    2.55  
    2.56  	# Check possibly modified files against other packages files.list
    2.57 @@ -320,7 +315,7 @@
    2.58  				if [ ! -f "$PKGS_DB/packages.list" ]; then
    2.59  					tazpkg recharge
    2.60  				fi
    2.61 -				get-install $pkg
    2.62 +				spk-add $pkg
    2.63  			fi
    2.64  		done
    2.65  	else