status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

PR Updates

This commit is contained in:
Matt Keeler 2018-06-19 12:41:24 -04:00
parent 90e74da6b7
commit 21fcb45f36
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/functions/20-build.sh
View File

@ -218,7 +218,7 @@ function build_consul_post {
rm -r pkg.bin.new rm -r pkg.bin.new
DEV_PLATFORM="./pkg/bin/${extra_dir}$(go env GOOS)_$(go env GOARCH)" DEV_PLATFORM="./pkg/bin/${extra_dir}$(go env GOOS)_$(go env GOARCH)"
for F in $(find ${DEV_PLATFORM} -type f -mindepth 1 -maxdepth 1 ) for F in $(find ${DEV_PLATFORM} -mindepth 1 -maxdepth 1 -type f )
do do
# recreate the bin dir # recreate the bin dir
rm -r bin/* 2> /dev/null rm -r bin/* 2> /dev/null

2
build-support/functions/30-release.sh
View File

@ -87,7 +87,7 @@ function package_binaries {
rm -rf "${ddir}" > /dev/null 2>&1 rm -rf "${ddir}" > /dev/null 2>&1
mkdir -p "${ddir}" >/dev/null 2>&1 mkdir -p "${ddir}" >/dev/null 2>&1
for platform in $(find -type d "${sdir}" -mindepth 1 -maxdepth 1 ) for platform in $(find "${sdir}" -mindepth 1 -maxdepth 1 -type d )
do do
local os_arch=$(basename $platform) local os_arch=$(basename $platform)
local dest="${ddir}/${CONSUL_PKG_NAME}_${vers}_${os_arch}.zip" local dest="${ddir}/${CONSUL_PKG_NAME}_${vers}_${os_arch}.zip"

2
build-support/scripts/build-docker.sh
View File

@ -133,7 +133,7 @@ function main {
if is_set "${refresh}" if is_set "${refresh}"
then then
status_stage "==> Refreshing Legacy UI build container image" status_stage "==> Refreshing Legacy UI build container image"
export UI_LEAGCY_BUILD_TAG="${image:-${UI_LEGACY_BUILD_CONTAINER_DEFAULT}}" export UI_LEGACY_BUILD_TAG="${image:-${UI_LEGACY_BUILD_CONTAINER_DEFAULT}}"
refresh_docker_images "${sdir}" ui-legacy-build-image || return 1 refresh_docker_images "${sdir}" ui-legacy-build-image || return 1
fi fi
status_stage "==> Building UI" status_stage "==> Building UI"

2
build-support/scripts/functions.sh
View File

@ -9,7 +9,7 @@ FUNC_DIR=$(pwd)
popd > /dev/null popd > /dev/null
popd > /dev/null popd > /dev/null
func_sources=$(find ${FUNC_DIR} -type f -mindepth 1 -maxdepth 1 -name "*.sh" | sort -n) func_sources=$(find ${FUNC_DIR} -mindepth 1 -maxdepth 1 -name "*.sh" -type f | sort -n)
for src in $func_sources for src in $func_sources
do do