Fix issues with "spin configure" (#167)

Author: jaydrogers

lib/actions/base64.sh

@@ -23,14 +23,10 @@ action_base64() {
             # Decode the input
             if [ -f "$input" ]; then
                 # If it's a file, decode the file contents
-                base64_decode - < "$input"
+                base64_decode "$input"
             else
                 # If it's not a file, assume it's a base64 string and try to decode it
-                echo "$input" | base64_decode - 2>/dev/null
-                if [ $? -ne 0 ]; then
-                    echo "Error: Input is not a valid base64 string."
-                    return 1
-                fi
+                base64_decode "$input"
             fi
             ;;
         *)

lib/actions/configure.sh

@@ -80,7 +80,7 @@ configure_gha() {
 
     echo "🔑 Adding GitHub Actions secrets..."
     # Loop through all files in the CI folder (sorted alphabetically)
-    find "$SPIN_CI_FOLDER" -type f -maxdepth 1 | sort | while read -r filepath; do
+    find "$SPIN_CI_FOLDER"  -maxdepth 1 -type f | sort | while read -r filepath; do
         file=$(basename "$filepath")
         # Skip files with file extensions and .gitignore
         if [[ "$file" != *.* ]]; then
@@ -136,20 +136,31 @@ gh_set_env() {
     return 1
   fi
 
-  # Get content from either file or value
-  local content
+# Get content from either file or value
   if [ -n "$file" ]; then
+    if [ ! -f "$file" ]; then
+      echo "${BOLD}${RED}❌ File not found: $file${RESET}"
+      return 1
+    fi
+    
+    # Read file content and normalize line endings to ensure consistency across platforms
+    # Convert all line endings to Unix format (LF) for cross-platform compatibility
+    content=$(cat "$file" | tr -d '\r')
+    
+    # Optionally base64 encode the content
     if [ "$base64_encode" = true ]; then
-      content=$(base64_encode "$file")
-    else
-      content=$(<"$file")
+      content=$(base64_encode "$content")
     fi
-  else
+  elif [ -n "$value" ]; then
+    content="$value"
+    
+    # Optionally base64 encode the content
     if [ "$base64_encode" = true ]; then
-      content=$(echo -n "$value" | base64_encode -)
-    else
-      content="$value"
+      content=$(base64_encode "$content")
     fi
+  else
+    echo "${BOLD}${RED}❌ No file or value specified${RESET}"
+    return 1
   fi
 
   # Set the secret using the gh CLI

lib/functions.sh

@@ -10,19 +10,43 @@ add_user_todo_item() {
 
 base64_encode() {
     local input="$1"
-    if [[ "$(uname -s)" == "Darwin" ]]; then
-        base64 -i "$input"
+    
+    # Check if input is a file path or should be treated as content
+    if [[ -f "$input" ]]; then
+        # File path - use existing behavior
+        if [[ "$(uname -s)" == "Darwin" ]]; then
+            base64 -b 0 -i "$input"
+        else
+            base64 -w 0 "$input"
+        fi
     else
-        base64 "$input"
+        # Content - pipe through base64
+        if [[ "$(uname -s)" == "Darwin" ]]; then
+            echo "$input" | base64 -b 0
+        else
+            echo "$input" | base64 -w 0
+        fi
     fi
 }
 
 base64_decode() {
     local input="$1"
-    if [[ "$(uname -s)" == "Darwin" ]]; then
-        base64 -D "$input"
+    
+    # Check if input is a file path or should be treated as content
+    if [[ -f "$input" ]]; then
+        # File path - use existing behavior
+        if [[ "$(uname -s)" == "Darwin" ]]; then
+            base64 -D "$input"
+        else
+            base64 -d "$input"
+        fi
     else
-        base64 -d "$input"
+        # Content - pipe through base64 decode
+        if [[ "$(uname -s)" == "Darwin" ]]; then
+            echo "$input" | base64 -D
+        else
+            echo "$input" | base64 -d
+        fi
     fi
 }