From 65b46aa46c45ddfe062ac0059365519b4dd36dab Mon Sep 17 00:00:00 2001
From: eliott <eliott.sammier@tetras-libre.fr>
Date: Fri, 5 Jul 2024 11:30:47 +0200
Subject: [PATCH] Change how VERSION is handled in mcli
---
mcli | 49 ++++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/mcli b/mcli
index 5e248c75..6561e50b 100755
--- a/mcli
+++ b/mcli
@@ -1,26 +1,23 @@
#!/usr/bin/env bash
-# 'status' command is an exception, must be run before setting all the env vars
-if [[ "$1" == "status" ]]; then
- echo "VERSION=$VERSION"
- echo "MACAO_ROOT=$MACAO_ROOT"
- echo "SOURCES_DIR=$SOURCES_DIR"
- echo "SCRIPTS_DIR=$SCRIPTS_DIR"
- echo "RESULTS_DIR=$RESULTS_DIR"
- echo "INDEXES_DIR=$INDEXES_DIR"
- echo ""
- echo "Python virtual env: ${VIRTUAL_ENV:-"not set"}"
- echo -n "mcli: "
- if which mcli >/dev/null; then echo "available"; else echo "not in PATH"; fi
- echo ""
- git status
- exit
+# Default value for version env var
+if [[ -z "$VERSION" ]]; then
+ VERSION="all"
fi
-
-export VERSION="macao_${VERSION:-12}" # macao_12 by default
+# First parameter overrides version if set
+if [[ "$1" == "12" || "$1" == "3" ]]; then
+ VERSION="macao_$1"
+ shift
+elif [[ "$1" == "all" ]]; then
+ VERSION="all"
+ shift
+fi
+export VERSION
export MACAO_ROOT="${MACAO_ROOT:-$(dirname "$(realpath "$0")")}"
-export SOURCES_DIR="$MACAO_ROOT/Basilisk/MACAO/$VERSION"
-export SCRIPTS_DIR="$MACAO_ROOT/tetras_extraction/$VERSION/script"
+SOURCES_DIR="$MACAO_ROOT/Basilisk/MACAO"
+[[ "$VERSION" != "all" ]] && SOURCES_DIR="$SOURCES_DIR/$VERSION"
+export SOURCES_DIR
+export SCRIPTS_DIR="$MACAO_ROOT/tetras_extraction/macao_12/script"
export RESULTS_DIR="$MACAO_ROOT/tetras_extraction/$VERSION/result"
export INDEXES_DIR="$RESULTS_DIR/indexes"
mkdir -p "$INDEXES_DIR"
@@ -241,6 +238,20 @@ shell)
cd "$MACAO_ROOT"
$SHELL
;;
+status)
+ echo "VERSION=$VERSION"
+ echo "MACAO_ROOT=$MACAO_ROOT"
+ echo "SOURCES_DIR=$SOURCES_DIR"
+ echo "SCRIPTS_DIR=$SCRIPTS_DIR"
+ echo "RESULTS_DIR=$RESULTS_DIR"
+ echo "INDEXES_DIR=$INDEXES_DIR"
+ echo ""
+ echo "Python virtual env: ${VIRTUAL_ENV:-"not set"}"
+ echo -n "mcli: "
+ if which mcli >/dev/null; then echo "available"; else echo "not in PATH"; fi
+ echo ""
+ cd "$MACAO_ROOT" && git status
+ ;;
*)
print_usage
;;
--
GitLab