From 5d3131b494d2fd8c6c06091044de97d487121f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Sun, 26 May 2024 19:45:56 +0200
Subject: [PATCH] rework top-level helpers

---
 helpers/helpers | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/helpers/helpers b/helpers/helpers
index 311a7c478..1a5e269de 100644
--- a/helpers/helpers
+++ b/helpers/helpers
@@ -9,30 +9,26 @@ if [[ -n "${1:-}" ]]; then
 elif [[ -n "${YNH_APP_HELPERS_VERSION:-}" ]]; then
     # ...or as environment variable set from manifest
     :
-elif [[ -n "${YNH_APP_PACKAGING_FORMAT:-}" ]]; then
-    # ...or default to packaging format version.
-    YNH_APP_HELPERS_VERSION="$YNH_APP_PACKAGING_FORMAT"
 else
     # ...or default to 1
     YNH_APP_HELPERS_VERSION=1
 fi
 
-
-YNH_APP_HELPERS_DIR="$SCRIPT_DIR/helpers.v${YNH_APP_HELPERS_VERSION}.d"
-if [[ ! -d "$YNH_APP_HELPERS_DIR" ]]; then
-    echo "Helpers are not available in version '$YNH_APP_HELPERS_VERSION'." >&2
-    exit 1
-fi
-
-
 # This is a trick to later only restore set -x if it was set when calling this script
 readonly XTRACE_ENABLE=$(set +o | grep xtrace)
 set +x
 
-readarray -t HELPERS < <(find "$YNH_APP_HELPERS_DIR" -mindepth 1 -maxdepth 1 -type f)
-
-for helper in "${HELPERS[@]}"; do
-    [ -r "$helper" ] && source "$helper"
-done
+YNH_APP_HELPERS_DIR="$SCRIPT_DIR/helpers.v${YNH_APP_HELPERS_VERSION}.d"
+case "$YNH_APP_HELPERS_VERSION" in
+    1)
+        readarray -t HELPERS < <(find "$YNH_APP_HELPERS_DIR" -mindepth 1 -maxdepth 1 -type f)
+        for helper in "${HELPERS[@]}"; do
+            [ -r "$helper" ] && source "$helper"
+        done
+        ;;
+    *)
+        echo "Helpers are not available in version '$YNH_APP_HELPERS_VERSION'." >&2
+        exit 1
+esac
 
 eval "$XTRACE_ENABLE"