spk rev 63
spk-add, libspk.sh: rename a function and use lowercase for internal var
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri May 18 03:09:37 2012 +0200 (2012-05-18) |
parents | 36c7fb7707d0 |
children | fb6acdd2617c |
files | lib/libspk.sh spk-add |
line diff
1.1 --- a/lib/libspk.sh Fri May 18 02:49:36 2012 +0200 1.2 +++ b/lib/libspk.sh Fri May 18 03:09:37 2012 +0200 1.3 @@ -96,7 +96,8 @@ 1.4 gettext "Mirrored :"; echo " $count" 1.5 } 1.6 1.7 -is_package_mirrored() { 1.8 +# Check if package is on main or extra mirror. 1.9 +mirrored_pkg() { 1.10 local name=$1 1.11 local occurance=$(grep "^$name |" $pkgsdesc) 1.12 [ -n "$occurance" ]
2.1 --- a/spk-add Fri May 18 02:49:36 2012 +0200 2.2 +++ b/spk-add Fri May 18 03:09:37 2012 +0200 2.3 @@ -285,15 +285,15 @@ 2.4 local package_name="$1" 2.5 2.6 # Check if get-Package 2.7 - if ! is_package_mirrored $package_name; then 2.8 + if mirrored_pkg get-$package_name; then 2.9 package_name="get-$package_name" 2.10 - AUTOEXEC=true 2.11 + exec=true 2.12 fi 2.13 2.14 # Check if package is mirrored 2.15 - if ! is_package_mirrored $package_name; then 2.16 - gettext "Could not find package on mirror:"; echo " $package_name" 2.17 - exit 1 2.18 + if ! mirrored_pkg $package_name; then 2.19 + gettext "Could not find package on mirror:" 2.20 + boldify " $package_name" && exit 1 2.21 fi 2.22 2.23 # package_full=Package-Version 2.24 @@ -324,8 +324,8 @@ 2.25 2.26 install_package "$CACHE_DIR/$package_full.tazpkg" 2.27 2.28 - #[ "$AUTOEXEC" ] && chroot $root/ $package_name 2.29 - [ "$AUTOEXEC" ] && $package_name $root 2.30 + #[ "$exec" ] && chroot $root/ $package_name 2.31 + [ "$exec" ] && $package_name $root 2.32 update_databases 2.33 } 2.34