add warning message to bw compat scripts

paulscherrerinstitute · Jun 26, 2024 · 7347b75 · 7347b75
1 parent f7c0b59
commit 7347b75
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 16 deletions.
diff --git a/cmd/scripts/argconverter.sh → cmd/scripts/common.sh b/cmd/scripts/argconverter.sh → cmd/scripts/common.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# shellcheck disable=SC2034
+RED='\033[0;31m'
+YEL='\033[1;33m'
+NC='\033[0m' # No Color
+WARN_STRING="${RED}Warning!${YEL} These backwards compatibilty scripts will soon be deprecated!${NC} Please use, or update your code to use, the scicat-cli executable directly."
+
 function arg_conversion {
     args=("$@")
 

diff --git a/cmd/scripts/datasetArchiver b/cmd/scripts/datasetArchiver
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetArchiver "${modified_args[@]}"
diff --git a/cmd/scripts/datasetCleaner b/cmd/scripts/datasetCleaner
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetCleaner "${modified_args[@]}"
diff --git a/cmd/scripts/datasetGetProposal b/cmd/scripts/datasetGetProposal
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetGetProposal "${modified_args[@]}"
diff --git a/cmd/scripts/datasetIngestor b/cmd/scripts/datasetIngestor
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetIngestor "${modified_args[@]}"
diff --git a/cmd/scripts/datasetPublishData b/cmd/scripts/datasetPublishData
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetPublishData "${modified_args[@]}"
diff --git a/cmd/scripts/datasetPublishDataRetrieve b/cmd/scripts/datasetPublishDataRetrieve
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetPublishDataRetrieve "${modified_args[@]}"
diff --git a/cmd/scripts/datasetRetriever b/cmd/scripts/datasetRetriever
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli datasetRetriever "${modified_args[@]}"
diff --git a/cmd/scripts/scicat-cli b/cmd/scripts/scicat-cli
diff --git a/cmd/scripts/waitForJobFinished b/cmd/scripts/waitForJobFinished
@@ -3,8 +3,8 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # shellcheck source=/dev/null
-source "$SCRIPT_DIR"/argconverter.sh
+source "$SCRIPT_DIR"/common.sh
 
+echo -e "${WARN_STRING}"
 modified_args=$(arg_conversion "$@")
-
 "$SCRIPT_DIR"/scicat-cli waitForJobFinished "${modified_args[@]}"