Skip to content

Commit

Permalink
Check if build_target var is defined in entrypoint.bash (#2042)
Browse files Browse the repository at this point in the history
  • Loading branch information
edgarasg authored and Nick Vyzas committed May 6, 2019
1 parent db03ba2 commit 7d371cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ else
fi
${MAKE} cleanbuild
${MAKE} ${MAKEOPT} "${deps_target}"
${MAKE} ${MAKEOPT} "${build_target}"

if [[ -z ${build_target} ]] ; then
${MAKE} ${MAKEOPT}
else
${MAKE} ${MAKEOPT} "${build_target}"
fi
# Prepare package files and build RPM
cp /root/ctl/proxysql.ctl /opt/proxysql/proxysql.ctl
sed -i "s/PKG_VERSION_CURVER/${CURVER}/g" /opt/proxysql/proxysql.ctl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ else
fi
${MAKE} cleanbuild
${MAKE} ${MAKEOPT} "${deps_target}"
${MAKE} ${MAKEOPT} "${build_target}"

if [[ -z ${build_target} ]] ; then
${MAKE} ${MAKEOPT}
else
${MAKE} ${MAKEOPT} "${build_target}"
fi

# Prepare package files and build RPM
echo "==> Packaging"
Expand Down

0 comments on commit 7d371cf

Please sign in to comment.