# HG changeset patch # User Antoine Bodin # Date 1298589420 -3600 # Node ID ac0c4dea6951fc94b6365fc674220ddb0e39e175 # Parent 90799aa9089b935784cf024aa65cfc061f798221 Add !unpack COOK_OPT + a little fix diff -r 90799aa9089b -r ac0c4dea6951 tazwok --- a/tazwok Thu Feb 24 03:57:01 2011 +0100 +++ b/tazwok Fri Feb 25 00:17:00 2011 +0100 @@ -93,11 +93,7 @@ get_options_list="$get_options_list SLITAZ_DIR SLITAZ_VERSION undigest" get_options - if [ "$undigest" ]; then - LOCAL_REPOSITORY=$SLITAZ_DIR/$undigest - else - LOCAL_REPOSITORY=$SLITAZ_DIR/$SLITAZ_VERSION - fi + LOCAL_REPOSITORY=$SLITAZ_DIR/${undigest:-$SLITAZ_VERSION} if ! [ "$save_dir" ]; then if [ -f $LOCAL_REPOSITORY/tazwok.conf ] || [ -f $LOCAL_REPOSITORY/slitaz.conf ]; then @@ -442,6 +438,7 @@ check_for_tarball() { [ "$WGET_URL" ] || return 0 + look_for_cookopt !unpack && nounpack=yes report step "Checking for source tarball: $PACKAGE" local repack_src=$repack_src TARBALL=$TARBALL if [ "$repack_src" = yes ] && look_for_cookopt !repack_src; then @@ -472,9 +469,10 @@ fi fi report end-step - if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$nounpack" ]; then + if { [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$nounpack" ] ; } || \ + { [ -f "$SOURCES_REPOSITORY/$TARBALL" ] && [ "$repack_src" != yes ] && [ "$nounpack" ] ; }; then [ -d "$tmp_src" ] && rm -r $tmp_src - return + return 0 fi # Untaring source if necessary. We don't need to extract source if