slitaz-modular rev 152
mkiso.sh: Make sure varibles made in backup_pkg and backup_src are local.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sat Dec 24 16:21:25 2011 +0000 (2011-12-24) |
parents | 0ede00e3c781 |
children | 130e216fd686 |
files | mkiso.sh |
line diff
1.1 --- a/mkiso.sh Sun Dec 18 14:06:44 2011 +0000 1.2 +++ b/mkiso.sh Sat Dec 24 16:21:25 2011 +0000 1.3 @@ -329,6 +329,7 @@ 1.4 sed -i "s|$pkg||g" $ISODIR/packages-installed.list 1.5 fi 1.6 done 1.7 + local pkg wanted rwanted pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION 1.8 cook gen-cooklist $ISODIR/packages-installed.list > $ISODIR/cookorder.list 1.9 [ -f $PKGS/fullco.txt ] || cook gen-wok-db $WOKHG 1.10 cookorder=$ISODIR/cookorder.list 1.11 @@ -353,6 +354,7 @@ 1.12 [ $(grep -l "^$wanted$" $PROFILE/list/backupall.banned) ] && continue 1.13 fi 1.14 fi 1.15 + 1.16 if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then 1.17 info "Backing up $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log 1.18 ln -sf $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$incoming_pkg_VERSION.tazpkg 1.19 @@ -370,7 +372,7 @@ 1.20 [ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue 1.21 fi 1.22 fi 1.23 - 1.24 + 1.25 if [ -f $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg ]; then 1.26 info "Backing up $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log 1.27 ln -sf $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$incoming_pkg_VERSION.tazpkg 1.28 @@ -435,6 +437,7 @@ 1.29 [ -d $SOURCES_REPOSITORY ] || mkdir -p $SOURCES_REPOSITORY 1.30 [ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR 1.31 mkdir -p $SRCISO_DIR 1.32 + local pkg cookorder pkg_VERSION 1.33 cookorder=$ISODIR/cookorder.list 1.34 [ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt 1.35 [ -f $LOG/cook-getsrc.log ] && rm -rf $LOG/cook-getsrc.log