fix shellcheck

Signed-off-by: Phani Sajja <psajja@progress.com>
habitat-sh · Jan 16, 2025 · 619edf5 · 619edf5
1 parent c3f1ef6
commit 619edf5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/components/plan-build/habitat/plan.sh b/components/plan-build/habitat/plan.sh
@@ -34,6 +34,7 @@ do_before() {
 }
 
 do_build() {
+  # shellcheck disable=SC2154
   cp -v "$SRC_PATH"/bin/${program}-"${pkg_target#*-}".sh "$CACHE_PATH/$program"
 
   # Use the bash from our dependency list as the shebang. Also, embed the

diff --git a/components/studio/bin/hab-studio-darwin.sh b/components/studio/bin/hab-studio-darwin.sh
@@ -362,6 +362,7 @@ new_studio() {
 
   # Load the appropriate type strategy to complete the setup
   if [ -n "${HAB_STUDIO_BINARY:-}" ]; then
+    # shellcheck disable=SC2154
     studio_type_dir="$studio_binary_libexec_path"
   else
     studio_type_dir="$libexec_path"
@@ -419,6 +420,7 @@ enter_studio() {
     set -x
   fi
 
+  # shellcheck disable=2086
   $studio_env_command -i \
     $sandbox_env \
     "$sandbox_exec_cmd" -f "$sandbox_profile_path" \

diff --git a/components/studio/habitat/plan.sh b/components/studio/habitat/plan.sh
@@ -28,6 +28,7 @@ do_prepare() {
 }
 
 do_build() {
+  # shellcheck disable=SC2154
   cp -v "$SRC_PATH"/bin/hab-studio-"${pkg_target#*-}".sh hab-studio
   cp -v "$SRC_PATH"/libexec/hab-studio-profile.sh .
   cp -v "$SRC_PATH"/libexec/hab-studio-type-*.sh .

diff --git a/components/studio/libexec/hab-studio-type-darwin-bootstrap.sh b/components/studio/libexec/hab-studio-type-darwin-bootstrap.sh
@@ -8,6 +8,7 @@
 studio_type="bootstrap"
 studio_env_command="/usr/bin/env"
 studio_enter_environment="STUDIO_ENTER=true"
+# shellcheck disable=SC2154
 studio_enter_command="$libexec_path/hab pkg exec core/build-tools-hab-backline bash --rcfile $HAB_STUDIO_ROOT/etc/profile"
 studio_build_environment=
 studio_build_command="${HAB_STUDIO_ROOT}${HAB_ROOT_PATH}/bin/build"
@@ -17,6 +18,7 @@ studio_run_command="$libexec_path/hab pkg exec core/build-tools-hab-backline bas
 run_user="hab"
 run_group="$run_user"
 
+# shellcheck disable=SC2154
 finish_setup() {
     src_dir="$($pwd_cmd)"
     $mkdir_cmd -p "$HAB_STUDIO_ROOT"/etc

diff --git a/components/studio/libexec/hab-studio-type-darwin-default.sh b/components/studio/libexec/hab-studio-type-darwin-default.sh
@@ -8,6 +8,7 @@
 studio_type="default"
 studio_env_command="/usr/bin/env"
 studio_enter_environment="STUDIO_ENTER=true"
+# shellcheck disable=SC2154
 studio_enter_command="$libexec_path/hab pkg exec core/hab-backline bash --rcfile $HAB_STUDIO_ROOT/etc/profile"
 studio_build_environment=
 studio_build_command="${HAB_STUDIO_ROOT}${HAB_ROOT_PATH}/bin/build"
@@ -17,6 +18,7 @@ studio_run_command="$libexec_path/hab pkg exec core/hab-backline bash --rcfile $
 run_user="hab"
 run_group="$run_user"
 
+# shellcheck disable=SC2154
 finish_setup() {
     src_dir="$($pwd_cmd)"
     $mkdir_cmd -p "$HAB_STUDIO_ROOT"/etc