Shellcheck fixes for environment folder

Signed-off-by: Judy Ng <[email protected]>
judysng · Jan 17, 2024 · e323a7a · e323a7a
1 parent e5b38eb
commit e323a7a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cookbooks/aws-parallelcluster-environment/files/imds/imds-access.sh b/cookbooks/aws-parallelcluster-environment/files/imds/imds-access.sh
@@ -19,7 +19,8 @@ function info() {
 }
 
 function help() {
-  local -- cmd=$(basename "$0")
+  local -- cmd
+  cmd=$(basename "$0")
   cat <<EOF
 
   Usage: ${cmd} [OPTION]...

diff --git a/cookbooks/aws-parallelcluster-environment/files/login_nodes/keys-manager.sh b/cookbooks/aws-parallelcluster-environment/files/login_nodes/keys-manager.sh
@@ -18,7 +18,8 @@ function info() {
 }
 
 function help() {
-  local -- cmd=$(basename "$0")
+  local -- cmd
+  cmd=$(basename "$0")
   cat <<EOF
 
   Usage: ${cmd} [OPTION]...

diff --git a/cookbooks/aws-parallelcluster-environment/files/setup-ephemeral-drives.sh b/cookbooks/aws-parallelcluster-environment/files/setup-ephemeral-drives.sh
@@ -17,11 +17,10 @@ LVM_PATH="/dev/${LVM_VG_NAME}/${LVM_NAME}"
 LVM_ACTIVE_STATE="a"
 FS_TYPE="ext4"
 MOUNT_OPTIONS="noatime,nodiratime"
-# cfn_ephemeral_dir is set in the environment by cfnconfig sourcing
+# shellcheck disable=SC2154 # cfn_ephemeral_dir is set in the environment by cfnconfig sourcing
 INPUT_MOUNTPOINT="${cfn_ephemeral_dir}"
 
 function log {
-  SCRIPT=$(basename "$0")
   MESSAGE="$1"
   echo "ParallelCluster - ${MESSAGE}"
 }
@@ -73,7 +72,7 @@ function print_block_device_mapping {
 function check_instance_store {
   if ls /dev/nvme* >& /dev/null; then
     IS_NVME=1
-    MAPPINGS=$(realpath --relative-to=/dev/ -P /dev/disk/by-id/nvme*Instance_Storage* | grep -v "*Instance_Storage*" | uniq)
+    MAPPINGS=$(realpath --relative-to=/dev/ -P /dev/disk/by-id/nvme*Instance_Storage* | grep -v "Instance_Storage" | uniq)
   else
     IS_NVME=0
     set_imds_token