From ae8a36a60b0e3a39568a1422d25a70a2c5e59ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= <tomalok@gmail.com>
Date: Mon, 11 Jul 2022 18:45:06 -0700
Subject: [PATCH] * post-shellcheck fixes

---
 lib/tiny-cloud/nocloud/imds | 12 +++++++-----
 lib/tiny-cloud/oci/imds     |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/tiny-cloud/nocloud/imds b/lib/tiny-cloud/nocloud/imds
index 97c3e30..e82f3f2 100644
--- a/lib/tiny-cloud/nocloud/imds
+++ b/lib/tiny-cloud/nocloud/imds
@@ -15,10 +15,10 @@ _load_nocloud_cmdline() {
             v=$(echo "$kv" | cut -d= -f2- | sed -Ee s'|^file://|/|')
             case "$k" in
                 h|hostname)
-                    echo -e "\nhostname: $hostname" >> "$TINY_CLOUD_VAR/meta-data"
+                    echo -e "\nhostname: $v" >> "$TINY_CLOUD_VAR/meta-data"
                     ;;
                 i|instance-id)
-                    echo -e "\ninstance-id: $hostname" >> "$TINY_CLOUD_VAR/meta-data"
+                    echo -e "\ninstance-id: $v" >> "$TINY_CLOUD_VAR/meta-data"
                     ;;
                 s|seedfrom)
                     for data in $NOCLOUD_FILES; do
@@ -34,7 +34,6 @@ _load_nocloud_cmdline() {
                             *) echo "WARNING: Ignoring unknown seedfrom value '$v'" >&2
                                 ;;
                         esac
-                        ;;
                     done
                     ;;
                 *)  echo "WARNING: Ignoring unknown nocloud kernel cmdline key '$k'" >&2
@@ -77,7 +76,6 @@ load_nocloud() {
 _imds() {
     local file="$TINY_CLOUD_VAR"/$(echo "$1" | cut -d/ -f1)
     local key=$(echo "$1" | cut -d/ -f2-)
-    local data value
 
     is_nocloud_loaded || load_nocloud || return 1
 
@@ -85,5 +83,9 @@ _imds() {
     [ -f "$file" ] || return 1
 
     # use 'file/' to get top-level keys
-    [ "$1" = "$file" ] && cat "$file" || yx -f "$file" "$key"
+    if [ "$1" = "$file" ]; then
+        cat "$file"
+    else
+        yx -f "$file" "$key"
+    fi
 }
\ No newline at end of file
diff --git a/lib/tiny-cloud/oci/imds b/lib/tiny-cloud/oci/imds
index caface5..dfb2518 100644
--- a/lib/tiny-cloud/oci/imds
+++ b/lib/tiny-cloud/oci/imds
@@ -27,7 +27,7 @@ _imds_ssh_keys() { _imds "$IMDS_SSH_KEYS"; }
 
 _imds_nic_index() {
     local m n=0
-    local mac=$(cat /sys/class/net/$1/mac)
+    local mac=$(cat "/sys/class/net/$1/mac")
     while m=$(imds $IMDS_NICS/$n/mac | tr A-F a-f); do
         [ "$m" = "$mac" ] && echo $n; return 0
     done