PR Updates

build-support/functions/20-build.sh

@@ -218,7 +218,7 @@ function build_consul_post {
    rm -r pkg.bin.new
       
    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
       # recreate the bin dir
       rm -r bin/* 2> /dev/null

build-support/functions/30-release.sh

@@ -87,7 +87,7 @@ function package_binaries {
    
    rm -rf "${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
       local os_arch=$(basename $platform)
       local dest="${ddir}/${CONSUL_PKG_NAME}_${vers}_${os_arch}.zip"

build-support/scripts/build-docker.sh

@@ -133,7 +133,7 @@ function main {
          if is_set "${refresh}"
          then
             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
          fi
          status_stage "==> Building UI"

build-support/scripts/functions.sh

@@ -9,7 +9,7 @@ FUNC_DIR=$(pwd)
 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
 do