From 655b0db65848a4f352ce71dd2b0738a3ab466549 Mon Sep 17 00:00:00 2001 From: Nate Woolls Date: Tue, 5 Nov 2024 13:03:10 -0500 Subject: [PATCH 1/2] Use env to specify bash interpreter in idserver.sh Fixes '/usr/bin/bash: no such file or directory' --- idserver.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idserver.sh b/idserver.sh index 3ed629399..f72e4cf2a 100644 --- a/idserver.sh +++ b/idserver.sh @@ -1,4 +1,5 @@ -#!/usr/bin/bash +#!/usr/bin/env bash + config="debug" # Getting the bash script executing path. See: https://stackoverflow.com/a/630387 From a69a057f1c2af6e59df42e9b3c6385c95f7b1e2d Mon Sep 17 00:00:00 2001 From: Nate Woolls Date: Tue, 5 Nov 2024 13:04:48 -0500 Subject: [PATCH 2/2] Refactor idserver.sh to improve function definitions and reorganize calling options Fixes 'command not found' --- idserver.sh | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) mode change 100644 => 100755 idserver.sh diff --git a/idserver.sh b/idserver.sh old mode 100644 new mode 100755 index f72e4cf2a..feefae865 --- a/idserver.sh +++ b/idserver.sh @@ -15,45 +15,6 @@ source_dir="$base_dir/src" build_dir="$base_dir/build" result_dir="$build_dir/results" -# Calling options -case $1 in -"clean") - clean - echo "All cleaned" - ;; -"compile") - compile - echo "All compiled" - ;; -"dockerBuild") - dockerBuild - echo "Docker images builded" - ;; -"dockerUp") - dockerUp - echo "Docker containers running" - ;; -"dockerDown") - dockerDown - echo "Docker containers deleted" - ;; -"dockerStart") - dockerStart - echo "Docker containers started" - ;; -"dockerStop") - dockerStop - echo "Docker containers stopped" - ;; -"fetchSubComponent") - fetchSubComponent - echo "Submodules updated" - ;; -*) - help - ;; -esac - # Config profile if [[ -n $2 ]]; then config=$2 @@ -137,7 +98,7 @@ function dockerStop() { docker compose -f "$base_dir/local-docker-compose.yml" stop } -help() { +function help() { echo "Use: . idserver.sh OPTION CONFIG @@ -158,3 +119,42 @@ OPTIONs: CONFIGs: Possible values are: debug and release" } + +# Calling options +case $1 in +"clean") + clean + echo "All cleaned" + ;; +"compile") + compile + echo "All compiled" + ;; +"dockerBuild") + dockerBuild + echo "Docker images builded" + ;; +"dockerUp") + dockerUp + echo "Docker containers running" + ;; +"dockerDown") + dockerDown + echo "Docker containers deleted" + ;; +"dockerStart") + dockerStart + echo "Docker containers started" + ;; +"dockerStop") + dockerStop + echo "Docker containers stopped" + ;; +"fetchSubComponent") + fetchSubComponent + echo "Submodules updated" + ;; +*) + help + ;; +esac