spk rev 71
Removed spk-archive, moved extract to libspk
| author | Christian Mesh <meshca@clarkson.edu> |
|---|---|
| date | Sat May 19 10:47:48 2012 -0500 (2012-05-19) |
| parents | a946ed77f727 |
| children | a2490e434a47 0da00dac24ed |
| files | lib/libspk.sh spk-add spk-archive spk-rm |
line diff
1.1 --- a/lib/libspk.sh Sat May 19 04:59:02 2012 -0500 1.2 +++ b/lib/libspk.sh Sat May 19 10:47:48 2012 -0500 1.3 @@ -184,6 +184,47 @@ 1.4 fi 1.5 } 1.6 1.7 +# Extract .tazpkg cpio archive into a directory. 1.8 +# Parameters: package_file results_directory 1.9 +extract_package() { 1.10 + local package_file=$1 1.11 + local target_dir=$2 1.12 + 1.13 + # Validate the file 1.14 + check_valid_tazpkg $package_file 1.15 + 1.16 + # Find the package name 1.17 + local package_name=$(package_name $package_file) 1.18 + 1.19 + # Create destination directory 1.20 + local dest_dir=$(pwd)/$package_name 1.21 + [ -n "$target_dir" ] && dest_dir=$target_dir/$package_name 1.22 + mkdir -p $dest_dir 1.23 + 1.24 + newline 1.25 + echo $(boldify $(gettext "Extracting:")) $package_name 1.26 + separator 1.27 + 1.28 + gettext "Copying original package..." 1.29 + cp $package_file $dest_dir 1.30 + status 1.31 + 1.32 + cd $dest_dir 1.33 + size=$(du -sh $package_file | sed s/$package_file//) 1.34 + echo -n $(gettext "Extracting archive"): $size 1.35 + cpio -idm --quiet < ${package_file##*/} 1.36 + rm -f ${package_file##*/} 1.37 + unlzma -c fs.cpio.lzma | cpio -idm --quiet 1.38 + rm fs.cpio.lzma 1.39 + status 1.40 + cd - > /dev/null 1.41 + 1.42 + separator 1.43 + echo -n "$package_name" 1.44 + gettext "is extracted to:"; echo " $dest_dir" 1.45 + newline 1.46 +} 1.47 + 1.48 # Unser var set by mirrored_pkg 1.49 unset_mirrored() { 1.50 unset mirrored mirror db pwd
2.1 --- a/spk-add Sat May 19 04:59:02 2012 -0500 2.2 +++ b/spk-add Sat May 19 10:47:48 2012 -0500 2.3 @@ -107,10 +107,8 @@ 2.4 [ "$verbose" ] && status 2.5 2.6 # Extract Package 2.7 - cd $tmpdir || exit 1 2.8 rm receipt 2.9 - spk-archive extract $package_file 2.10 - cd - >/dev/null 2.11 + extract_package $package_file $tmpdir 2.12 2.13 # Get files to remove if upgrading 2.14 local files_to_remove
3.1 --- a/spk-archive Sat May 19 04:59:02 2012 -0500 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,119 +0,0 @@ 3.4 -#!/bin/sh 3.5 -# 3.6 -# Spk-Archive - SliTaz Package Archive Manager 3.7 -# 3.8 -# NOT COMPLETE: Still need to re-write (just what was grabbed from tazpkg) 3.9 -# 3.10 -# Authors : See the AUTHORS files 3.11 - 3.12 -source /usr/lib/slitaz/libspk.sh 3.13 - 3.14 -usage() { 3.15 - name=$(basename $0) 3.16 - cat << EOT 3.17 - 3.18 -$(boldify $(gettext "Usage:")) $name [command] package 3.19 - 3.20 -$(boldify $(gettext "Commands:")) 3.21 - pack 3.22 - repack [--config] 3.23 - extract 3.24 - recompress 3.25 - 3.26 -$(boldify "$(gettext "Example:")") 3.27 - $name extract package 3.28 - 3.29 -EOT 3.30 - exit 0 3.31 -} 3.32 - 3.33 -# Extract a package with cpio and gzip/lzma to the current directory. 3.34 -# Parameters: package_file 3.35 -extract_package() { 3.36 - local package_file=$1 3.37 - local package_name=$(package_name $package_file) 3.38 - local size=$(du -sh $package_file | awk '{print $1}') 3.39 - 3.40 - gettext "Extracting archive"; echo -n ": $size" 3.41 - cpio -idm --quiet < ${package_file##*/} && rm -f ${package_file##*/} 3.42 - unlzma -c fs.cpio.lzma | cpio -idm --quiet && rm fs.cpio.lzma 3.43 - status 3.44 -} 3.45 - 3.46 -# Extract .tazpkg cpio archive into a directory. 3.47 -# Parameters: package_file results_directory 3.48 -extract() { 3.49 - local package_file=$1 3.50 - local target_dir=$2 3.51 - 3.52 - # Validate the file 3.53 - check_valid_tazpkg $package_file 3.54 - 3.55 - # Find the package name 3.56 - local package_name=$(package_name $package_file) 3.57 - 3.58 - # Create destination directory 3.59 - local dest_dir=$(pwd)/$package_name 3.60 - [ -n "$target_dir" ] && dest_dir=$target_dir/$package_name 3.61 - mkdir -p $dest_dir 3.62 - 3.63 - newline 3.64 - echo $(boldify $(gettext "Extracting:")) $package_name 3.65 - separator 3.66 - 3.67 - gettext "Copying original package..." 3.68 - cp $package_file $dest_dir 3.69 - status 3.70 - cd $dest_dir 3.71 - extract_package $package $package_file 3.72 - cd - > /dev/null 3.73 - separator 3.74 - echo -n "$package_name" 3.75 - gettext "is extracted to:"; echo " $dest_dir" 3.76 - newline 3.77 -} 3.78 - 3.79 -# Recompress .tazpkg cpio archive with lzma. 3.80 -# Parameters: package_file 3.81 -recompress() { 3.82 - local package_file=$1 3.83 - valid_tazpkg $package_file 3.84 - 3.85 - local package_name=$(package_name $package_file) 3.86 - 3.87 - newline 3.88 - echo $(boldify $(gettext "Recompressing:")) $package_name 3.89 - separator 3.90 - 3.91 - mkdir -p $TMP_DIR 3.92 - 3.93 - gettext "Copying original package..." 3.94 - cp $package_file $TMP_DIR 3.95 - status 3.96 - 3.97 - cd $TMP_DIR 3.98 - extract_package $package_file 3.99 - gettext "Recompressing the fs..." 3.100 - find fs | cpio -o -H newc --quiet | lzma e fs.cpio.lzma -si 3.101 - rm -rf fs 3.102 - status 3.103 - cd - > /dev/null 3.104 - 3.105 - gettext "Creating new package..." 3.106 - find $TMP_DIR -print | cpio -o -H newc --quiet > \ 3.107 - $(basename $package_file).$$ && mv -f \ 3.108 - $(basename $package_file).$$ \ 3.109 - $(basename $package_file) 3.110 - status 3.111 - 3.112 - rm -rf $TMP_DIR 3.113 -} 3.114 - 3.115 -case $1 in 3.116 - extract|-e) 3.117 - extract_package $2 $3 ;; 3.118 - recompress|-r) 3.119 - recompress $2 ;; 3.120 - *) 3.121 - usage ;; 3.122 -esac
4.1 --- a/spk-rm Sat May 19 04:59:02 2012 -0500 4.2 +++ b/spk-rm Sat May 19 10:47:48 2012 -0500 4.3 @@ -157,7 +157,7 @@ 4.4 esac 4.5 # Be sure package is installed 4.6 if [ ! -f "$installed/$pkg/receipt" ]; then 4.7 - echo -n "$(boldify "$pkg") " 4.8 + echo -n "$(boldify $pkg) " 4.9 gettext "package is not installed"; newline 4.10 continue 4.11 fi