spk diff spk-add @ rev 28
spk-add: rename some functions
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue May 15 18:56:21 2012 +0200 (2012-05-15) |
parents | eb8149264a44 |
children | 1e166d1364d7 |
line diff
1.1 --- a/spk-add Tue May 15 18:33:55 2012 +0200 1.2 +++ b/spk-add Tue May 15 18:56:21 2012 +0200 1.3 @@ -218,7 +218,7 @@ 1.4 1.5 # Install .tazpkg packages. 1.6 # Parameters: package_file 1.7 -install_pkg() { 1.8 +install_local() { 1.9 package_file="$1" 1.10 check_root 1.11 check_valid_tazpkg $package_file 1.12 @@ -237,7 +237,7 @@ 1.13 1.14 # Download and install a package. TODO: Handle Undigest Mirrors 1.15 # Parameters: package_name 1.16 -get_install() { 1.17 +install_web() { 1.18 local package_name="$1" 1.19 1.20 check_root 1.21 @@ -354,18 +354,26 @@ 1.22 # Old style 1.23 case $1 in 1.24 install|-i) 1.25 - install_pkg $2 $3 1.26 + install_local $2 $3 1.27 exit 0 ;; 1.28 get-install|-gi) 1.29 - get_install $2 1.30 + install_web $2 1.31 exit 0 ;; 1.32 "") usage ;; 1.33 esac 1.34 1.35 -# Usage: spk-add package ... packageN 1.36 +# 1.37 +# Handle packages: package package.tazpkg ... packageN packageN.tazpkg 1.38 +# 1.39 + 1.40 +check_root 1.41 + 1.42 for pkg in $@ 1.43 do 1.44 - [ -d "$installed/$pkg" ] && continue 1.45 + case "$pkg" in 1.46 + *.tazpkg|.spk) 1.47 + echo "Local package" ;; 1.48 + esac 1.49 echo "Adding: $pkg" 1.50 done 1.51 exit 0