SliTaz Repositories

     1.1 --- a/mkiso.sh	Thu Sep 08 04:02:17 2011 +0000
     1.2 +++ b/mkiso.sh	Sat Sep 10 23:47:21 2011 +0000
     1.3 @@ -318,6 +318,7 @@
     1.4  backup_pkg() {
     1.5  	if [ "${BACKUP_PACKAGES}" = "yes" ]; then
     1.6  		[ -d $PKGISO_DIR ] && rm -r $PKGISO_DIR
     1.7 +		[ -f $LOG/backup_pkg.log ] && rm -rf $LOG/backup_pkg.log
     1.8  		mkdir -p $PKGISO_DIR
     1.9  		info "Making cooking list based installed packages in union"
    1.10  		# this is to filter out packages build by get- 
    1.11 @@ -351,22 +352,28 @@
    1.12  			for wanted in $rwanted; do
    1.13  				if [ -f $PROFILE/list/backupall.banned ]; then
    1.14  					[ "$BACKUP_ALL" = "yes" ] && \
    1.15 -						[ $(grep -l "^$wamted$" $PROFILE/list/backupall.banned) ] && continue
    1.16 +						[ $(grep -l "^$wanted$" $PROFILE/list/backupall.banned) ] && continue
    1.17  				fi
    1.18  				if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
    1.19 +					info "Backing up $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.20  					ln -sf $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$incoming_pkg_VERSION.tazpkg
    1.21  				elif [ -f $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg ]; then
    1.22 +					info "Backing up $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.23  					ln -sf $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
    1.24  				elif [ -f $CACHE_REPOSITORY/$Wanted-$cache_pkg_VERSION.tazpkg ]; then
    1.25 +					info "Backing up $CACHE_REPOSITORY/$wanted-$cache_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.26  					ln -sf $CACHE_REPOSITORY/$wanted-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$cache_pkg_VERSION.tazpkg
    1.27  				fi
    1.28  			done
    1.29 -
    1.30 +			
    1.31  			if [ -f $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg ]; then
    1.32 +				info "Backing up $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.33  				ln -sf $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$incoming_pkg_VERSION.tazpkg
    1.34  			elif [ -f $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg ]; then
    1.35 +				info "Backing up $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.36  				ln -sf $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$pkg_VERSION.tazpkg
    1.37  			elif [ -f $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg ]; then
    1.38 +				info "Backing up $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.39  				ln -sf $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$cache_pkg_VERSION.tazpkg
    1.40  			fi
    1.41  		done
    1.42 @@ -426,6 +433,7 @@
    1.43  		cookorder=$ISODIR/cookorder.list
    1.44  		[ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt
    1.45  		[ -f $LOG/cook-getsrc.log ] && rm -rf $LOG/cook-getsrc.log
    1.46 +		[ -f $LOG/backup_src.log ] && rm -rf $LOG/backup_src.log
    1.47  		cat $cookorder | grep -v "^#"| while read pkg; do
    1.48  			if [ -f $PROFILE/list/backupall.banned ]; then
    1.49  				[ "$BACKUP_ALL" = "yes" ] && \
    1.50 @@ -441,26 +449,33 @@
    1.51  				tail -1 | sed 's/ *//')"
    1.52  			[ -f "$PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg" ] || continue
    1.53  			#{ [ ! "$TARBALL" ] || [ ! "$WGET_URL" ] ; } && continue
    1.54 +			LZMA_TARBALL="${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma"
    1.55  			if [ "$PATCH" ]; then
    1.56  				if [ -f "$SOURCES_REPOSITORY/$(basename $PATCH)" ]; then
    1.57 +					info "Backing up $SOURCES_REPOSITORY/$(basename $PATCH)" | tee -a $LOG/backup_src.log
    1.58  					ln -sf $SOURCES_REPOSITORY/$(basename $PATCH) $SRCISO_DIR/$(basename $PATCH)
    1.59  				else
    1.60  					cook $PACKAGE --getsrc | tee -a $LOG/cook-getsrc.log
    1.61  					if [ -f "$SOURCES_REPOSITORY/$(basename $PATCH)" ]; then
    1.62 +						info "Backing up $SOURCES_REPOSITORY/$(basename $PATCH)" | tee -a $LOG/backup_src.log
    1.63  						ln -sf $SOURCES_REPOSITORY/$(basename $PATCH) $SRCISO_DIR/$(basename $PATCH)
    1.64  					fi
    1.65  				fi
    1.66  			fi
    1.67 -			if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ]; then
    1.68 -				ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
    1.69 +			if [ -f "$SOURCES_REPOSITORY/$LZMA_TARBALL" ]; then
    1.70 +				info "Backing up $SOURCES_REPOSITORY/$LZMA_TARBALL" | tee -a $LOG/backup_src.log
    1.71 +				ln -sf $SOURCES_REPOSITORY/$LZMA_TARBALL $SRCISO_DIR/$LZMA_TARBALL
    1.72  			elif [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
    1.73 +				info "Backing up $SOURCES_REPOSITORY/$TARBALL" | tee -a $LOG/backup_src.log
    1.74  				ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
    1.75  			else
    1.76  				cook $PACKAGE --getsrc | tee -a $LOG/cook-getsrc.log
    1.77  				if [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
    1.78 +					info "Backing up $SOURCES_REPOSITORY/$TARBALL" | tee -a $LOG/backup_src.log
    1.79  					ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
    1.80 -				elif [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ]; then
    1.81 -					ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
    1.82 +				elif [ -f "$SOURCES_REPOSITORY/$LZMA_TARBALL" ]; then
    1.83 +					info "Backing up $SOURCES_REPOSITORY/$LZMA_TARBALL" | tee -a $LOG/backup_src.log
    1.84 +					ln -sf $SOURCES_REPOSITORY/$LZMA_TARBALL $SRCISO_DIR/$LZMA_TARBALL
    1.85  				fi
    1.86  			fi
    1.87  		done