tazwok rev 516
Revert last commit.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Mon May 09 16:01:27 2011 +0000 (2011-05-09) |
parents | 012b3c074bdc |
children | 3780ddec2497 |
files | tazwok |
line diff
1.1 --- a/tazwok Mon May 09 13:09:31 2011 +0000 1.2 +++ b/tazwok Mon May 09 16:01:27 2011 +0000 1.3 @@ -116,8 +116,8 @@ 1.4 1.5 # /!\ This part needs some changes. 1.6 # Basically, get these files from the net if they are missing. 1.7 - dep_db=$PACKAGES_REPOSITORY/wok-depends.txt 1.8 - wan_db=$PACKAGES_REPOSITORY/wok-wanted.txt 1.9 + dep_db=$INCOMING_REPOSITORY/wok-depends.txt 1.10 + wan_db=$INCOMING_REPOSITORY/wok-wanted.txt 1.11 1.12 # Check commons directories, create them if user is root. 1.13 if test $(id -u) = 0 ; then 1.14 @@ -1559,10 +1559,10 @@ 1.15 look_for_dep() 1.16 { 1.17 if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then 1.18 - grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt \ 1.19 + grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \ 1.20 | cut -f 2 1.21 else 1.22 - grep -m1 ^$PACKAGE$'\t' $dep_db | \ 1.23 + grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \ 1.24 cut -f 2 1.25 fi 1.26 } 1.27 @@ -1575,19 +1575,19 @@ 1.28 look_for_all() 1.29 { 1.30 if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then 1.31 - grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt \ 1.32 + grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \ 1.33 | cut -f 2,3 | sed 's/ / /' 1.34 else 1.35 - grep -m1 ^$PACKAGE$'\t' $dep_db | \ 1.36 + grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \ 1.37 cut -f 2,3 | sed 's/ / /' 1.38 fi 1.39 } 1.40 1.41 look_for_rdep() 1.42 { 1.43 - fgrep ' '$PACKAGE' ' $dep_db | cut -f 1 1.44 + fgrep ' '$PACKAGE' ' $INCOMING_REPOSITORY/wok-depends.txt | cut -f 1 1.45 if [ "$undigest" ]; then 1.46 - for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt | cut -f 1); do 1.47 + for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt | cut -f 1); do 1.48 if [ ! -f "WOK$/$rdep/receipt" ]; then 1.49 echo "$rdep" 1.50 fi 1.51 @@ -1597,10 +1597,10 @@ 1.52 1.53 look_for_rbdep() 1.54 { 1.55 - fgrep ' '$PACKAGE' ' $dep_db | \ 1.56 + fgrep ' '$PACKAGE' ' $INCOMING_REPOSITORY/wok-depends.txt | \ 1.57 cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1 1.58 if [ "$undigest" ]; then 1.59 - for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt \ 1.60 + for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \ 1.61 | cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1); do 1.62 if [ ! -f "WOK$/$rdep/receipt" ]; then 1.63 echo "$rdep" 1.64 @@ -1613,18 +1613,18 @@ 1.65 look_for_wanted() 1.66 { 1.67 if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then 1.68 - grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-wanted.txt | cut -f 2 1.69 + grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-wanted.txt | cut -f 2 1.70 else 1.71 - grep -m1 ^$PACKAGE$'\t' $wan_db | cut -f 2 1.72 + grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 2 1.73 fi 1.74 } 1.75 1.76 # Return packages which wants PACKAGE. 1.77 look_for_rwanted() 1.78 { 1.79 - grep $'\t'$PACKAGE$ $wan_db | cut -f 1 1.80 + grep $'\t'$PACKAGE$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1 1.81 if [ "$undigest" ]; then 1.82 - for rwanted in $(grep $'\t'$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-wanted.txt | cut -f 1); do 1.83 + for rwanted in $(grep $'\t'$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-wanted.txt | cut -f 1); do 1.84 if [ ! -f "$WOK/$rwanted/receipt" ]; then 1.85 echo "$rwanted" 1.86 fi