tazpkg rev 658
Fix install-list
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun Feb 16 17:38:09 2014 +0100 (2014-02-16) |
parents | 72a6355f37b3 |
children | a131c14a016b |
files | tazpkg |
line diff
1.1 --- a/tazpkg Sun Feb 16 14:07:21 2014 +0100 1.2 +++ b/tazpkg Sun Feb 16 17:38:09 2014 +0100 1.3 @@ -1970,7 +1970,8 @@ 1.4 for pkg in $LIST 1.5 do 1.6 grep -qs ^$pkg$ $2-processed && continue 1.7 - tazpkg $COMMAND $pkg --list=$2 "$3" "$4" "$5" 1.8 + [ -d "$root/var/lib/tazpkg/installed" ] && continue 1.9 + tazpkg $COMMAND $pkg --list=$(basename $2) "$3" "$4" "$5" 1.10 done 1.11 rm -f $2-processed ;; 1.12 add-flavor) 1.13 @@ -2754,7 +2755,7 @@ 1.14 check_for_package_in_list 1.15 cd $CACHE_DIR 1.16 if [ -f "$PACKAGE.tazpkg" ]; then 1.17 - eval_gettext "\$PACKAGE already in the cache: \$CACHE_DIR"; echo 1.18 + eval_gettext "\$PACKAGE already in the cache"; echo 1.19 # Check package download was finished 1.20 tail -c 2k $PACKAGE.tazpkg | fgrep -q 00000000TRAILER || { 1.21 eval_gettext "Continuing \$PACKAGE download"; echo 1.22 @@ -2768,8 +2769,8 @@ 1.23 download $PACKAGE.tazpkg 1.24 fi 1.25 PACKAGE_FILE=$CACHE_DIR/$PACKAGE.tazpkg 1.26 - cp -a $PACKAGE_FILE $CURRENT_DIR 1.27 - ;; 1.28 + cp -a $PACKAGE_FILE $CURRENT_DIR ;; 1.29 + 1.30 get-install|-gi) 1.31 # Download and install a package. 1.32 check_root $@