SliTaz Repositories

     1.1 --- a/mkiso.sh	Sun Jun 12 21:46:42 2011 +0000
     1.2 +++ b/mkiso.sh	Sat Jun 18 19:39:53 2011 +0000
     1.3 @@ -412,21 +412,21 @@
     1.4  		cat $ISODIR/cookorder.list | grep -v "^#"| while read pkg; do
     1.5  			#rwanted=$(grep $'\t'$pkg$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1)
     1.6  			for i in $(ls $WOK/$pkg/receipt); do
     1.7 -				unset SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL
     1.8 +				unset SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL KBASEVER
     1.9  				source $i
    1.10  				#{ [ ! "$TARBALL" ] || [ ! "$WGET_URL" ] ; } && continue
    1.11  				[ "$WGET_URL" ] || continue
    1.12  				if [ ! -f "$SOURCES_REPOSITORY/$TARBALL" ] && \
    1.13 -					[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ]; then
    1.14 +					[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ]; then
    1.15  					tazwok get-src $PACKAGE --nounpack
    1.16  					if [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
    1.17  						ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
    1.18 -					elif [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ]; then
    1.19 -						ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
    1.20 +					elif [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ]; then
    1.21 +						ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
    1.22  					fi
    1.23  				else
    1.24  					[ -f "$SOURCES_REPOSITORY/$TARBALL" ] && ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
    1.25 -					[ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
    1.26 +					[ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ] && ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
    1.27  				fi
    1.28  			done
    1.29  		done