From a1cd77e39cdc39c3637f0e28c03a4ac4ea930931 Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 1 Dec 2022 20:36:10 -0500 Subject: [PATCH] in fetch-cross-compiler.sh, stop if required piece failed to download --- sys/msdos/fetch-cross-compiler.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) mode change 100644 => 100755 sys/msdos/fetch-cross-compiler.sh diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh old mode 100644 new mode 100755 index 666aa2c41..49b5a633c --- a/sys/msdos/fetch-cross-compiler.sh +++ b/sys/msdos/fetch-cross-compiler.sh @@ -66,7 +66,7 @@ fi if [ ! -d djgpp/i586-pc-msdosdjgpp ]; then tar xjf "$DJGPP_FILE" - rm -f $DJGPP_FILE + #rm -f $DJGPP_FILE fi # DOS-extender for use with djgpp @@ -105,10 +105,22 @@ if [ ! -d djgpp/djgpp-patch ]; then if [ "$(uname)" = "Darwin" ]; then #Mac curl --output djlsr205.zip http://www.mirrorservice.org/sites/ftp.delorie.com/pub/djgpp/current/v2/djlsr205.zip + export cmdstatus=$? else wget --quiet --no-hsts http://www.mirrorservice.org/sites/ftp.delorie.com/pub/djgpp/current/v2/djlsr205.zip + export cmdstatus=$? fi ls -l + if [ $cmdstatus -eq 0 ]; then + echo "fetch of djgpp-patch was successful" + else + if [ -z "${TF_BUILD}" ]; then + echo "Unable to complete the build, exiting..." + else + echo "##vso[task.logissue type=warning;]Trouble downloading djgpp-patch" + fi + exit 0 + fi mkdir -p src/libc/go32 unzip -p djlsr205.zip src/libc/go32/exceptn.S >src/libc/go32/exceptn.S patch -p0 -l -i ../../../sys/msdos/exceptn.S.patch