Enhance messages produced by jhalfs when files do not exist in either /sources or SRC_ARCHIVE, also in cases when SRC_ARCHIVE is not set. Thanks to Tim Sarbin for the patch.

This commit is contained in:
Thomas Pegg 2010-03-12 03:46:12 +00:00
parent de63126155
commit 9d55d85112

View file

@ -71,14 +71,20 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
echo "$FILE: -- copied from $SRC_ARCHIVE" echo "$FILE: -- copied from $SRC_ARCHIVE"
fromARCHIVE=1 fromARCHIVE=1
else else
echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE}${OFF}"
fromARCHIVE=0 fromARCHIVE=0
# If the file does not exist yet in /sources download a fresh one # If the file does not exist yet in /sources download a fresh one
if [ ! -f $FILE ] ; then if [ ! -f $FILE ] ; then
if [[ ! ("$SRC_ARCHIVE" = "") ]] ; then
echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE} or /sources${OFF}"
else
echo "${BOLD}${YELLOW}$FILE: not found in /sources${OFF}"
fi
if ! wget $URL1 $WGETPARAM && ! wget $URL2 $WGETPARAM ; then if ! wget $URL1 $WGETPARAM && ! wget $URL2 $WGETPARAM ; then
gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING" gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING"
continue continue
fi fi
else
echo "${BOLD}${YELLOW}$FILE: using cached file in /sources${OFF}"
fi fi
fi fi