tazwok rev 457
Add WOK option again. This it shouldn't cause problems I hope. Fixed get-src to not error if incoming packages.desc doesn't exist.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Sat Mar 19 01:03:09 2011 +0000 (2011-03-19) |
| parents | 8b6dc81c4967 |
| children | ae0a39ba004a 6860bdd72031 |
| files | tazwok |
line diff
1.1 --- a/tazwok Fri Mar 18 20:17:03 2011 +0000 1.2 +++ b/tazwok Sat Mar 19 01:03:09 2011 +0000 1.3 @@ -91,7 +91,7 @@ 1.4 get_config 1.5 1.6 # Define & get options. 1.7 - get_options_list="$get_options_list SLITAZ_DIR SLITAZ_VERSION undigest" 1.8 + get_options_list="$get_options_list WOK SLITAZ_DIR SLITAZ_VERSION undigest" 1.9 get_options 1.10 1.11 LOCAL_REPOSITORY=$SLITAZ_DIR/${undigest:-$SLITAZ_VERSION} 1.12 @@ -109,7 +109,7 @@ 1.13 1.14 # The path to the most important files/dir used by Tazwok. 1.15 PACKAGES_REPOSITORY=$LOCAL_REPOSITORY/packages 1.16 - WOK=$LOCAL_REPOSITORY/wok 1.17 + [ "$WOK" ] || WOK=$LOCAL_REPOSITORY/wok 1.18 INCOMING_REPOSITORY=$LOCAL_REPOSITORY/packages-incoming 1.19 SOURCES_REPOSITORY=$LOCAL_REPOSITORY/src 1.20 set_common_path 1.21 @@ -610,7 +610,7 @@ 1.22 unset main_version 1.23 fi 1.24 fi 1.25 - if [ ! "$main_version" ] || [ $(grep -q "^$PACKAGE | $VERSION" $INCOMING_REPOSITORY/packages.desc) ]; then 1.26 + if [ ! "$main_version" ] || [ $(grep -q "^$PACKAGE | $VERSION" $INCOMING_REPOSITORY/packages.desc 2>/dev/null) ]; then 1.27 if [ -f $src_repository/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then 1.28 echo -e "$PACKAGE:incoming\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $src_repository/sources.list 1.29 elif [ -f "$src_repository/$TARBALL" ]; then