iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7265 from danowar2k/master 

FIX for PR #7254
This commit is contained in:
Megan Marsh 2019-02-04 13:58:06 -08:00 committed by GitHub
parent 2d3f84abf0 6857e937e2
commit ee2ed063e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build.sh
View File

@ -12,8 +12,11 @@ set -e
function validateToolPresence function validateToolPresence
{ {
local TOOLNAME=$1 local TOOLNAME=$1
which ${TOOLNAME} >/dev/null || echo "${TOOLNAME} is not on the path. Exiting..." which ${TOOLNAME} >/dev/null
if [ $? -ne 0 ]; then
echo "${TOOLNAME} is not on the path. Exiting..."
exit 1 exit 1
fi
} }
# Validates that all used tools are present; exits when any is not found # Validates that all used tools are present; exits when any is not found
@ -84,6 +87,7 @@ function convertPathOnCygwin() {
esac esac
} }
validatePreconditions
enterPackerSourceDir enterPackerSourceDir
ensureOutputStructure ensureOutputStructure
cleanOutputDirs cleanOutputDirs