From 6954918f00ee0141200643d4c4a414f7430f7712 Mon Sep 17 00:00:00 2001 From: clsung Date: Thu, 5 May 2005 09:21:25 +0000 Subject: - Bump the upgrade file structure to deal with a nonexistant directory without complaining. PR: 80636 Submitted by: Rod Taylor (maintainer) --- www/bricolage/files/bric_upgrade.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'www/bricolage') diff --git a/www/bricolage/files/bric_upgrade.sh b/www/bricolage/files/bric_upgrade.sh index eb2e943..fb5380c 100644 --- a/www/bricolage/files/bric_upgrade.sh +++ b/www/bricolage/files/bric_upgrade.sh @@ -12,7 +12,7 @@ fi # Ensure the old version exists at the end of the argument list OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"` -VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[012]$/OKAY/"` +VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[01234]$/OKAY/"` if [ "${VTEST}" != "OKAY" ] then echo "The final argument should be the old version of the port, in the format." @@ -31,10 +31,13 @@ fi # Now try to upgrade it for ver in `grep -A 1000 ${OLDVERSION} ${BRICUPGRADE}/versions.txt | tail -n +2` do - for file in `ls ${BRICUPGRADE}/${ver}` - do - ${BRICUPGRADE}/${ver}/${file} $@ # Run with our args - done + if [ -d ${BRICUPGRADE}/${ver} ] + then + for file in `ls ${BRICUPGRADE}/${ver}` + do + ${BRICUPGRADE}/${ver}/${file} $@ # Run with our args + done + fi done echo "Upgrade complete" -- cgit v1.1