fix: revert to /bin/sh

Author: Thomas G.

src/common-utils/_configure-feature.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Source colors script
 . zz_colors
@@ -12,7 +12,7 @@ help
 )
 
 if [ -z "$feature" ]; then
-    echo -e "Usage: configure-feature <feature>\r"
+    echo "Usage: configure-feature <feature>${End}"
     exit 1
 fi
 
@@ -22,16 +22,16 @@ export source=${source:-/usr/local/share/$feature}
 # Get the indent size from devcontainer.json with jq, default to 2 if not found
 export tabSize=4
 
-echo -e "Configuring feature <${Purple}$feature${None}>\r"
-echo -e "from <$source>\r"
+echo "Configuring feature <${Purple}$feature${None}>${End}"
+echo "from <$source>${End}"
 
 # Go to the module root
 cd "$(git rev-parse --show-toplevel)" >/dev/null
 
 # Deploy stubs if existing
 if [ -d $source/stubs ]; then
 
-    echo -e "${Blue}Deploy stubs${End}"
+    echo "${Blue}Deploy stubs${End}"
 
     find $source/stubs -type f -name ".*" -o -type f | while read file; do
 
@@ -50,7 +50,7 @@ if [ -d $source/stubs ]; then
             # Remove # occurrences in the file path
             dest=$(echo $dest | sed 's/\/\#/\//g')
 
-            echo -e "Add '$dest' to .gitignore\r"
+            echo "Add '$dest' to .gitignore${End}"
 
             # Add to .gitignore if not already there
             grep -qxF $dest .gitignore || echo -e "$dest" >>.gitignore
@@ -67,7 +67,7 @@ if [ -d $source/stubs ]; then
 fi
 
 # Log the merging process
-echo -e "${Blue}Merge all package folder json files into top level xxx.json${End}"
+echo "${Blue}Merge all package folder json files into top level xxx.json${End}"
 
 for package in package composer; do
 
@@ -77,19 +77,20 @@ for package in package composer; do
         echo "{}" >$package.json
     else
         # Pre-sort the existing package.json
-        echo -e "${Yellow}Pre-merge normalize $package.json${End}"
+        echo "${Yellow}Pre-merge normalize $package.json${End}"
         normalize-json -s -a -i -t ${tabSize:-4} $package.json
     fi
 
     # Merge all package folder json files into the top-level package.json
     find $source -maxdepth 1 -name _*.$package.json | sort | while read file; do
-        echo -e "${Yellow}Merge $file in $package.json${End}"
+        echo "${Yellow}Merge $file in $package.json${End}"
         jq --indent ${tabSize:-4} -s '.[0] * .[1]' $file $package.json >/tmp/$package.json && mv -f /tmp/$package.json $package.json
     done
 
 done
 
 # Call all configure-xxx.sh scripts
 find $source -maxdepth 1 -name configure-*.sh | sort | while read file; do
-    echo -e "${Yellow}Run $file${End}"
+    echo "${Yellow}Run $file${End}"
+    $file
 done

src/common-utils/_install-bin.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Source colors script
 . zz_colors
@@ -9,16 +9,16 @@ eval $(
 )
 
 if [ -z "$feature" ]; then
-    echo -e "Usage: install-bin <feature>\r"
+    echo "Usage: install-bin <feature>${End}"
     exit 1
 fi
 
-echo -e "Installing bin scripts for <${Purple}$feature${None}>...\r"
+echo "Installing bin scripts for <${Purple}$feature${None}>...${End}"
 
 # Find all shell scripts in the target directory, make them executable, and create symbolic links in /usr/local/bin
 find $target -type f -name "_*.sh" -exec echo {} \; -exec chmod +x {} \; | while read file; do
     # Create a symbolic link in /usr/local/bin with the script name (without the leading underscore and .sh extension)
     link=/usr/local/bin/$(basename $file | sed 's/^_//;s/.sh$//')
     ln -sf $file $link
-    echo -e "${Green}Linked '$file' to '$link'${End}"
+    echo "${Green}Linked '$file' to '$link'${End}"
 done

src/common-utils/_install-feature.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Source colors script
 . zz_colors
@@ -9,28 +9,28 @@ eval $(
 )
 
 if [ -z "$feature" ]; then
-    echo -e "Usage: install-feature <feature>\r"
+    echo "Usage: install-feature <feature>${End}"
     exit 1
 fi
 
-echo -e "Installing feature <${Purple}$feature${None}>...\r"
+echo  "Installing feature <${Purple}$feature${None}>...${End}"
 
 # Copy stubs to the target directory
 if [ -d $source/stubs ]; then
-    echo -e "${Blue}Copying stubs to '$target'...${End}"
+    echo "${Blue}Copying stubs to '$target'...${End}"
     mkdir -p $target/stubs && cp -r $source/stubs/* $target/stubs
 else
-    echo -e "${Yellow}No stubs found in '$source'${End}"
+    echo "${Yellow}No stubs found in '$source'${End}"
 fi
 
 # Install specific utils by copying them to the target directory and making them executable
 find $source \( -name "_*" -o -name "configure-*.sh" -o -path "stubs" \) -type f -exec cp {} $target \;
 find $target -type f -name "*.sh" -exec chmod +x {} \;
 
 # Call all the install-xxx scripts in the feature directory
-echo -e "${Blue}Calling all install scripts in '$source'...${End}"
+echo "${Blue}Calling all install scripts in '$source'...${End}"
 find $source -type f -name "install-*.sh" | while read script; do
-    echo -e "${Yellow}Calling $script...${End}"
+    echo "${Yellow}Calling $script...${End}"
     sh $script "$@"
-    echo -e "${Green}Done!${End}"
+    echo "${Green}Done!${End}"
 done

src/common-utils/_zz_args.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Source colors script
 . zz_colors
@@ -72,43 +72,43 @@ while getopts :$argnames value "$@"; do
     naming=$(echo -e "$varnames" | grep -E "^$value" | cut -f2)
 
     if [ -n "$OPTARG" ]; then
-        echo -e "$naming=$OPTARG"
+        echo "$naming=$OPTARG"
     else
-        echo -e "$naming=-$value"
+        echo "$naming=-$value"
     fi
 done
 
 # Display help information if requested
 if [ "$OPTARG" = "h" ] || [ "$OPTARG" = "help" ]; then
 
     (
-        echo ""
-        echo -e "$title"
-        echo ""
-        echo "Usage: ${Yellow}$(basename $caller)$lineinfo${None}; use ${Yellow}-h${None} for more information."
-        echo -e "$helpinfo"
-        echo ""
+        echo "${End}"
+        echo "$title${End}"
+        echo "${End}"
+        echo "Usage: ${Yellow}$(basename $caller)$lineinfo${None}; use ${Yellow}-h${None} for more information.${End}"
+        echo "$helpinfo${End}"
+        echo "${End}"
     ) >&2
 
     exit 1
 
 elif [ "$OPTARG" = "@" ]; then
-    echo "Stop processing arguments !" >&2
+    echo "Stop processing arguments !${End}" >&2
 else
     # Shift the processed arguments
     shift $(expr "$OPTIND" - 1)
 
     # Process remaining '-' parameters
     for arg in $(echo $varnames | grep -E "^-" | cut -f2); do
         if [ "$#" -gt "0" ]; then
-            echo -e "$arg=$1" && shift 1
+            echo "$arg=$1" && shift 1
         fi
     done
 
     # Process remaining '+' parameters
     for arg in $(echo $varnames | grep -E "^\+" | cut -f2); do
         if [ "$#" -gt "0" ]; then
-            echo -e "$arg=$(echo $@ | sed "s/ /\\\\ /g")" && shift $#
+            echo "$arg=$(echo $@ | sed "s/ /\\\\ /g")" && shift $#
         fi
     done
 

src/common-utils/_zz_context.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Source colors script
 . zz_colors
@@ -23,11 +23,11 @@ else
 
         # Determine the caller script, remove /bin/xxx from the beginning of the command line and empty lines
         caller=$(readlink -f $PWD/$(tr '\0' '\n' </proc/$PPID/cmdline | sed 's/^\/bin\/.*$//' | grep -v '^$' | head -n 1))
-        echo "Caller script is <$caller>" >&2
+        echo "Caller script is <$caller>${End}" >&2
 
         # If the caller script cannot be determined, exit with an error
         if [ -z "$caller" ]; then
-            echo -e "${Red}Not in script context${End}" >&2
+            echo "${Red}Not in script context${End}" >&2
             exit 1
         fi
 
@@ -48,7 +48,7 @@ if [ -z "$target" ]; then
     elif [ -w /tmp ]; then
         target=/tmp/$feature
     else
-        echo -e "${Red}No writeable directory found${End}" >&2
+        echo "${Red}No writeable directory found${End}" >&2
         exit 1
     fi
 fi
@@ -57,7 +57,7 @@ fi
 mkdir -p $target
 
 # Log the results
-echo "Selected context for <${Purple}$feature${None}> is '$source' => '$target'" >&2
+echo "Selected context for <${Purple}$feature${None}> is '$source' => '$target'${End}" >&2
 
 # Results
 echo source=$source

src/common-utils/devcontainer-feature.json

@@ -1,12 +1,14 @@
 {
     "name": "Common Utils",
-    "version": "3.3.9",
+    "version": "3.3.12",
     "description": "Common utils for tomgrv/devcontainer-features",
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils": {}
     },
     "id": "common-utils",
-    "installsAfter": ["ghcr.io/devcontainers/features/common-utils"],
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ],
     "options": {
         "utils": {
             "type": "string",
@@ -49,4 +51,4 @@
             ]
         }
     }
-}
+}