summaryrefslogtreecommitdiffstats
path: root/compat32-tools
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-02-27 18:57:46 +0000
committer Eric Hameleers <alien@slackware.com>2013-02-27 18:57:46 +0000
commit5c2f8cf37bbf08264282e561cd2f008e4cc6cb5f (patch)
treee0593b35f38809d08cce110bd60d41c9a80c5a30 /compat32-tools
parent1f9f8b017b9123e4b820b0d78e200dd2e797f0e4 (diff)
downloadmultilib-5c2f8cf37bbf08264282e561cd2f008e4cc6cb5f.tar.gz
multilib-5c2f8cf37bbf08264282e561cd2f008e4cc6cb5f.tar.xz
Fix the case where the script reports "FAIL" when a package is not found... it skipped the rest of the series.
Also silenced a few unwanted error output cases.
Diffstat (limited to 'compat32-tools')
-rwxr-xr-xcompat32-tools/massconvert32.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/compat32-tools/massconvert32.sh b/compat32-tools/massconvert32.sh
index 1c31712..4f2bb16 100755
--- a/compat32-tools/massconvert32.sh
+++ b/compat32-tools/massconvert32.sh
@@ -175,7 +175,7 @@ function conv_pkg () {
if [ -z "$FULLPKG" ]; then
[ $VERBOSE -eq 1 ] && echo "*** FAIL: package '$BP' was not found in repository!"
- break
+ continue
else
# The requested original was found in the repository.
# Do we have a local converted package already?
@@ -251,7 +251,7 @@ if contains_spaces "$TARGET64ROOT" ; then
fi
# Where the scripts are:
-SRCDIR=$(cd $(dirname $0); pwd)
+SRCDIR=$(cd $(dirname $(which $0)); pwd)
# The script that does the package conversion:
CONV32=$SRCDIR/convertpkg-compat32
@@ -282,9 +282,9 @@ fi
# Get a list of available patches
if [ -n "$SLACK32URL" ]; then
- PATCH_LIST=$(echo $(lftp -c "open $(dirname $SLACK32URL)/patches/packages/ ; cls *.t?z" | rev | cut -f4- -d- |rev))
+ PATCH_LIST=$(echo $(lftp -c "open $(dirname $SLACK32URL)/patches/packages/ ; cls *.t?z" 2>/dev/null | rev | cut -f4- -d- |rev))
else
- PATCH_LIST=$(echo $(cd $(dirname $SLACK32ROOT)/patches/packages/ ; ls -1 *.t?z | rev | cut -f4- -d- |rev))
+ PATCH_LIST=$(echo $(cd $(dirname $SLACK32ROOT)/patches/packages/ 2>/dev/null ; ls -1 *.t?z 2>/dev/null | rev | cut -f4- -d- |rev))
fi
# This is the script's internal list of what I consider as the essential