Fix build.sh to run dependencies_check prior to using curl. (#299)

This commit is contained in:
Russ Kubes 2019-07-01 07:17:13 -05:00 committed by XECDesign
parent 3c559aeb56
commit 4ca539cb45

View file

@ -197,6 +197,8 @@ source "${SCRIPT_DIR}/common"
# shellcheck source=scripts/dependencies_check # shellcheck source=scripts/dependencies_check
source "${SCRIPT_DIR}/dependencies_check" source "${SCRIPT_DIR}/dependencies_check"
dependencies_check "${BASE_DIR}/depends"
#check username is valid #check username is valid
if [[ ! "$FIRST_USER_NAME" =~ ^[a-z][-a-z0-9_]*$ ]]; then if [[ ! "$FIRST_USER_NAME" =~ ^[a-z][-a-z0-9_]*$ ]]; then
echo "Invalid FIRST_USER_NAME: $FIRST_USER_NAME" echo "Invalid FIRST_USER_NAME: $FIRST_USER_NAME"
@ -208,8 +210,6 @@ if [[ -n "${APT_PROXY}" ]] && ! curl --silent "${APT_PROXY}" >/dev/null ; then
exit 1 exit 1
fi fi
dependencies_check "${BASE_DIR}/depends"
mkdir -p "${WORK_DIR}" mkdir -p "${WORK_DIR}"
log "Begin ${BASE_DIR}" log "Begin ${BASE_DIR}"