From 029823a6b49e14c1d36861c15dbddac8adbd299e Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 26 May 2025 23:22:38 +1200 Subject: [PATCH] tidying --- source/build.sh | 4 ---- source/install_build_prerequisites.sh | 11 ----------- source/make_createagent.sh | 4 +++- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/source/build.sh b/source/build.sh index 4e07002..527bd0d 100755 --- a/source/build.sh +++ b/source/build.sh @@ -8,10 +8,6 @@ mkdir -p ${OUTPUT_DIR} # Exit on error set -e -# ensure we have latest dehydrate. -dehydrate -u - - function build_native() { local BUILDDIR=${SCRIPT_DIR}/build/native local PREVDIR=$PWD diff --git a/source/install_build_prerequisites.sh b/source/install_build_prerequisites.sh index a487565..2d7934a 100755 --- a/source/install_build_prerequisites.sh +++ b/source/install_build_prerequisites.sh @@ -133,17 +133,6 @@ if [ -n "$SUDO_USER" ] && [ "$SUDO_USER" != "root" ]; then fi fi -# ---------------------------------------------------------------------------------------------------------- -# DEHYDRATE -# ---------------------------------------------------------------------------------------------------------- - -# check if dehydrate command is installed -if ! command -v dehydrate &> /dev/null; then - curl -fsSL https://gitea.jde.nz/public/dehydrate/releases/download/latest/install.sh | bash -fi - -dehydrate -u - # ---------------------------------------------------------------------------------------------------------- # COMPLETE # ---------------------------------------------------------------------------------------------------------- diff --git a/source/make_createagent.sh b/source/make_createagent.sh index c0cf187..ccb7c99 100755 --- a/source/make_createagent.sh +++ b/source/make_createagent.sh @@ -11,9 +11,11 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" if ! command -v dehydrate &> /dev/null; then echo "dehydrate could not be found - installing" curl -fsSL https://gitea.jde.nz/public/dehydrate/releases/download/latest/install.sh | bash +else + # ensure we have latest dehydrate. + dehydrate -u fi mkdir -p "${SCRIPT_DIR}/src/autogen" - dehydrate "${SCRIPT_DIR}/agent-remote" "${SCRIPT_DIR}/src/autogen" dehydrate "${SCRIPT_DIR}/agent-local" "${SCRIPT_DIR}/src/autogen"