From 077d842a3cddb288c6f6c6fb28067a618b66b817 Mon Sep 17 00:00:00 2001 From: Alex Groleau Date: Wed, 16 Apr 2025 17:57:49 -0400 Subject: [PATCH] flow updates --- flow | 32 ++++++++++++-------------------- flows | 2 +- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/flow b/flow index 3343c3c..80677cf 100755 --- a/flow +++ b/flow @@ -16,44 +16,36 @@ env() { # If not set, try to get it from kubectl GITEA_TOKEN=$(kubectl get secret -n cellular gitea-git -o jsonpath='{.data.token}' | base64 --decode) if [ -z "$GITEA_TOKEN" ]; then - echo -e "❌ ${RED}GITEA_TOKEN is not set and couldn't be retrieved from kubectl${RESET}" >&2 - exit 1 + error "GITEA_TOKEN is not set and couldn't be retrieved from kubectl" >&2 + return 2 # Handled error fi export GITEA_TOKEN fi - echo -e "💰 ${GREEN}Environment variables set${RESET}" + success "Environment variables set" } build() { # Create build directory if it doesn't exist mkdir -p "$PACKAGE_DIRECTORY" # Get version - local version=$(get-version) - echo -e "📦 ${CYAN}Building site version ${GREEN}v$version${RESET}..." + local version + version=$(get-version) || return $? + info "Building site version v$version..." # Create the tarball - tar -czf "$PACKAGE_DIRECTORY/$GITEA_REPOSITORY.tar.gz" -C "$BUILD_DIRECTORY" . - echo -e "✨ ${GREEN}Build complete${RESET}" + tar -czf "$PACKAGE_DIRECTORY/$GITEA_REPOSITORY.tar.gz" -C "$BUILD_DIRECTORY" . || return 2 + success "Build complete" } site-usage() { - echo -e " ${CYAN}Site Commands:${RESET}" - echo -e " prepare Check required OS dependencies (if any are defined)." - echo -e " env Load environment variables from .env file." - echo -e " build Build the site (requires env)." - echo -e " tag Tag the build (requires build)." - echo -e " package Package the build (requires build)." - echo -e " release Release the build (requires package)." + printf "env\tLoad environment variables from .env file.\n" + printf "build\tBuild the site.\n" } site-flow() { case "$1" in - prepare) base prepare; return 0;; - env) env; return 0;; - build) build; return 0;; - tag) tag; return 0;; - package) env; package; return 0;; - release) env; release; return 0;; + env) env; return $?;; + build) build; return $?;; *) return 1 ;; esac } diff --git a/flows b/flows index 9d758d5..da3038c 160000 --- a/flows +++ b/flows @@ -1 +1 @@ -Subproject commit 9d758d581eb2eeefaea3d3882ac6ca506a7e0b08 +Subproject commit da3038c73672b6f4fca2b694030c7cd9450bcd11