SliTaz Repositories

     1.1 --- a/mkiso.sh	Mon Jul 11 11:29:33 2011 +0000
     1.2 +++ b/mkiso.sh	Tue Aug 02 04:58:12 2011 +0000
     1.3 @@ -50,8 +50,8 @@
     1.4  PACKAGES_REPOSITORY="$PKGS"
     1.5  INCOMING_REPOSITORY="$INCOMING"
     1.6  SOURCES_REPOSITORY="$SRC"
     1.7 -HG_LIST="cookutils flavors flavors-stable slitaz-base-files slitaz-boot-scripts slitaz-configs slitaz-dev-tools slitaz-doc slitaz-doc-wiki-data slitaz-forge slitaz-modular slitaz-pizza slitaz-tools ssfs tazlito tazpanel tazpkg tazusb tazweb tazwok website wok wok-tiny wok-undigest"
     1.8 -MY_HG_LIST="my-cookutils wok-tank"
     1.9 +HG_LIST="cookutils flavors flavors-stable slitaz-base-files slitaz-configs slitaz-dev-tools slitaz-doc slitaz-doc-wiki-data slitaz-forge slitaz-modular slitaz-pizza slitaz-tools ssfs tazlito tazpanel tazpkg tazusb tazweb tazwok website wok wok-tiny wok-undigest"
    1.10 +MY_HG_LIST="slitaz-boot-scripts my-cookutils wok-tank"
    1.11  MY_HG_URL="https://bitbucket.org/godane"
    1.12  
    1.13  error () { echo -e "\033[1;31;40m!!! \033[1;37;40m$@\033[1;0m"; }
    1.14 @@ -328,15 +328,16 @@
    1.15  			fi
    1.16  		done
    1.17  		cook gen-cooklist $ISODIR/packages-installed.list > $ISODIR/cookorder.list
    1.18 -		[ -f $CACHE/fullco ] || cook gen-wok-db $WOK
    1.19 +		[ -f $PKGS/fullco.txt ] || cook gen-wok-db $WOKHG
    1.20  		cookorder=$ISODIR/cookorder.list
    1.21 -		[ "$BACKUP_ALL" = "yes" ] && cookorder=$CACHE/fullco
    1.22 +		[ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt
    1.23 +		[ "$BACKUP_ALL" = "yes" ] && cp -a $cookorder $PKGISO_DIR/fullco.txt
    1.24  		CACHE_REPOSITORY="$CACHE_DIR/$(cat /etc/slitaz-release)/packages"
    1.25  
    1.26  		cat $cookorder | grep -v "^#" | while read pkg; do
    1.27  			[ -f "$WOK/$pkg/receipt" ] || continue
    1.28  			unset rwanted pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION
    1.29 -			rwanted=$(grep $'\t'$pkg$ $CACHE/wok-wanted | cut -f 1)
    1.30 +			rwanted=$(grep $'\t'$pkg$ $PKGS/wanted.txt | cut -f 1)
    1.31  			if [ -f $PROFILE/list/backupall.banned ]; then
    1.32  				[ "$BACKUP_ALL" = "yes" ] && \
    1.33  					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
    1.34 @@ -387,7 +388,7 @@
    1.35  						tail -1 | sed 's/ *//')"
    1.36  					cache_pkg_VERSION="$(grep -m1 -A1 ^$src_pkg$ $LOCALSTATE/packages.txt | \
    1.37  						tail -1 | sed 's/ *//')"
    1.38 -					rwanted=$(grep $'\t'$src_pkg$ $CACHE/wok-wanted | cut -f 1)
    1.39 +					rwanted=$(grep $'\t'$src_pkg$ $PKGS/wanted.txt | cut -f 1)
    1.40  					
    1.41  					for wanted in $rwanted; do
    1.42  						if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
    1.43 @@ -423,7 +424,7 @@
    1.44  		[ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR
    1.45  		mkdir -p $SRCISO_DIR
    1.46  		cookorder=$ISODIR/cookorder.list
    1.47 -		[ "$BACKUP_ALL" = "yes" ] && cookorder=$CACHE/fullco
    1.48 +		[ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt
    1.49  		[ -f $LOG/cook-getsrc.log ] && rm -rf $LOG/cook-getsrc.log
    1.50  		cat $cookorder | grep -v "^#"| while read pkg; do
    1.51  			if [ -f $PROFILE/list/backupall.banned ]; then
    1.52 @@ -431,11 +432,15 @@
    1.53  					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
    1.54  			fi
    1.55  			unset SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL KBASEVER
    1.56 +			unset pkg_VERSION
    1.57  			[ -f $WOK/$pkg/receipt ] || continue
    1.58  			source $WOK/$pkg/receipt
    1.59 +			[ "$WGET_URL" ] || continue
    1.60  			[ "$TARBALL" ] || continue
    1.61 +			pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $PKGISO_DIR/packages.txt | \
    1.62 +				tail -1 | sed 's/ *//')"
    1.63 +			[ -f "$PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg" ] || continue
    1.64  			#{ [ ! "$TARBALL" ] || [ ! "$WGET_URL" ] ; } && continue
    1.65 -			[ "$WGET_URL" ] || continue
    1.66  			if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ]; then
    1.67  				ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
    1.68  			elif [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then