spk rev 73

Bug fixes (my fault)
author Christian Mesh <meshca@clarkson.edu>
date Sat May 19 13:14:46 2012 -0500 (2012-05-19)
parents f6b0c7cd8d16
children ebb6a2a148db
files lib/libspk.sh spk-add
line diff
     1.1 --- a/lib/libspk.sh	Sat May 19 10:47:48 2012 -0500
     1.2 +++ b/lib/libspk.sh	Sat May 19 13:14:46 2012 -0500
     1.3 @@ -210,7 +210,7 @@
     1.4  	status
     1.5  	
     1.6  	cd $dest_dir	
     1.7 -	size=$(du -sh $package_file | sed s/$package_file//)
     1.8 +	size=$(du -sh $package_file | awk '{print $1}')
     1.9  	echo -n $(gettext "Extracting archive"): $size
    1.10  	cpio -idm --quiet < ${package_file##*/}
    1.11  	rm -f ${package_file##*/}
     2.1 --- a/spk-add	Sat May 19 10:47:48 2012 -0500
     2.2 +++ b/spk-add	Sat May 19 13:14:46 2012 -0500
     2.3 @@ -89,6 +89,7 @@
     2.4  				gettext "WARNING: Any dependencies installed"; newline
     2.5  			fi
     2.6  			install_deps $package_name $DEPENDS
     2.7 +		fi
     2.8  	else
     2.9  		newline
    2.10  	fi
    2.11 @@ -106,8 +107,10 @@
    2.12  	$CHECKSUM $(basename $package_file) >> $installed.$SUM
    2.13  	[ "$verbose" ] && status
    2.14  
    2.15 +	# Remove receipt that will be overwritten by extraction
    2.16 +	rm $tmpdir/receipt
    2.17 +	
    2.18  	# Extract Package
    2.19 -	rm receipt
    2.20  	extract_package $package_file $tmpdir
    2.21  
    2.22  	# Get files to remove if upgrading
    2.23 @@ -194,7 +197,6 @@
    2.24  		status
    2.25  		cd - >/dev/null
    2.26  	fi
    2.27 -
    2.28  	# Merge package FS with $root
    2.29  	nb=$(cat files.list | wc -l)
    2.30  	gettext "Installing files:"; echo -n " $nb"