tazpkg rev 485
tazpkg: Fix up grep is needed and small change
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue May 03 16:53:42 2011 +0200 (2011-05-03) |
parents | de46df482cf8 |
children | 78856de4b6e9 |
files | tazpkg |
line diff
1.1 --- a/tazpkg Sun May 01 20:16:53 2011 +0100 1.2 +++ b/tazpkg Tue May 03 16:53:42 2011 +0200 1.3 @@ -2380,25 +2380,24 @@ 1.4 blocked_count=0 1.5 for pkg in * 1.6 do 1.7 - VERSION="" 1.8 - EXTRAVERSION="" 1.9 + unset VERSION EXTRAVERSION 1.10 . $pkg/receipt 1.11 - md5=`fgrep " $PACKAGE-${VERSION}$EXTRAVERSION.tazpkg" \ 1.12 - ../installed.md5 | awk '{print $1}'` 1.13 + md5=$(fgrep " $PACKAGE-${VERSION}$EXTRAVERSION.tazpkg" \ 1.14 + ../installed.md5 | awk '{print $1}') 1.15 if ! fgrep -q "$md5 $PACKAGE-" ../packages.md5; then 1.16 # Skip when not found on mirror (local package) 1.17 grep -q ^$PACKAGE- ../packages.list || continue 1.18 - new=`fgrep "$PACKAGE |" ../packages.desc | awk '{print $3}'` 1.19 - if `grep -qs "^$PACKAGE" $BLOCKED`; then 1.20 + new=$(grep "^$PACKAGE |" ../packages.desc | awk '{print $3}') 1.21 + if $(grep -qs "^$PACKAGE" $BLOCKED); then 1.22 # Skip pkgs listed in $LOCALSTATE/blocked-packages.list 1.23 blocked_count=$(($blocked_count+1)) 1.24 else 1.25 if [ "$VERSION" == "$new" ]; then 1.26 - echo -n "$PACKAGE" 1.27 - echo -e "\033[26G `gettext \"New build :\"` $md5" 1.28 + echo -n "$PACKAGE:" 1.29 + echo -e "\\033[26G `gettext \"New build :\"` $md5" 1.30 else 1.31 - echo -n "$PACKAGE" 1.32 - echo -e "\033[26G `gettext \"New version :\"` $new" 1.33 + echo -n "$PACKAGE:" 1.34 + echo -e "\\033[26G `gettext \"New version :\"` $new" 1.35 fi 1.36 echo "$PACKAGE" >> $UP_LIST 1.37 fi 1.38 @@ -2425,7 +2424,7 @@ 1.39 if [ "$install" == "y" ]; then 1.40 continue 1.41 else 1.42 - gettext "Do you wish to install them now: y=yes n=no ? " 1.43 + gettext "Do you wish to install them now: y/n ? " 1.44 read install 1.45 fi 1.46 case "$install" in