fix: 🐛 correct crlf

Author: Thomas G.

install.sh

@@ -28,34 +28,34 @@ help
 
 # If 'all' argument is provided, set stubs and features to install all default features
 if [ -n "$all" ]; then
-    echo "${Yellow}Add default features${None}"
+    echo -e "${Yellow}Add default features${End}"
     stubs=1
     features=$(sed '/^\s*\/\//d' $source/stubs/.devcontainer/devcontainer.json | jq -r '.features | to_entries[] | select(.key | contains("tomgrv/devcontainer-features"))| .key| 
     split("/")[-1] | split(":")[0]')
 fi
 
 # If 'upd' argument is provided, set stubs and features to update all features
 if [ -n "$upd" ]; then
-    echo "${Green}Update features${None}"
+    echo -e "${Green}Update features${End}"
     stubs=1
     features=$(sed '/^\s*\/\//d' $source/.devcontainer/devcontainer.json | jq -r '.features | to_entries[] | select(.key | contains("tomgrv/devcontainer-features"))| .key|
     split("/")[-1] | split(":")[0]')
 fi
 
 # If 'stubs' argument is provided, indicate that stubs are selected
 if [ -n "$stubs" ]; then
-    echo "${Green}Stubs selected${None}"
+    echo -e "${Green}Stubs selected${End}"
 fi
 
 # If 'package' argument is provided, use the specified package.json file
 if [ -n "$package" ]; then
     file="$package"
     if [ ! -f "$file" ]; then
-        echo "${Red}File not found: $file${None}"
+        echo -e "${Red}File not found: $file${End}"
         exit
     fi
 
-    echo "${Green}Using $file${None}"
+    echo -e "${Green}Using $file${End}"
 
     # Extract features from the package.json file if not already set
     if [ -z "$features" ]; then
@@ -65,16 +65,16 @@ fi
 
 # If no features are selected, display an error message
 if [ -z "$features" ]; then
-    echo "${Red}No features selected${None}"
+    echo -e "${Red}No features selected${End}"
 else
-    echo "${Green}Selected features: $features${None}"
+    echo -e "${Green}Selected features: $features${End}"
 fi
 
 # Merge all files from the stub folder to the root using git merge-file if stubs are selected
 if [ -n "$stubs" ]; then
-    echo "${Yellow}Installing stubs...${None}"
+    echo -e "${Yellow}Installing stubs...${End}"
     $source/src/common-utils/_configure-feature.sh -s $source .
-    echo "${Green}Stubs installed${None}"
+    echo -e "${Green}Stubs installed${End}"
 fi
 
 # If features are selected, proceed with installation
@@ -86,47 +86,46 @@ if [ -n "$features" ]; then
     # Check if the script is running inside a container
     if [ "$CODESPACES" != "true" ] && [ "$REMOTE_CONTAINERS" != "true" ]; then
 
-        echo "${Red}You are not in a container${None}"
+        echo -e "${Red}You are not in a container${End}"
 
         # Run the install.sh script for each selected feature
         for feature in $features; do
             if [ -f "$source/src/$feature/install.sh" ]; then
-                echo "${Yellow}Running src/$feature/install.sh...${None}"
+                echo -e "${Yellow}Running src/$feature/install.sh...${End}"
                 sh $source/src/$feature/install.sh
-                echo "${Green}$feature installed${None}"
+                echo -e "${Green}$feature installed${End}"
             else
-                echo "${Red}$feature not found${None}"
+                echo -e "${Red}$feature not found${End}"
             fi
         done
 
         # Run the configure.sh script for each selected feature
         for feature in $features; do
             if [ -d "/tmp/$feature" ]; then
-                echo "${Yellow}Configuring /tmp/$feature...${None}"
+                echo -e "${Yellow}Configuring /tmp/$feature...${End}"
                 sh $source/src/common-utils/_configure-feature.sh -s /tmp/$feature $feature
-                echo "${Green}$feature configured${None}"
+                echo -e "${Green}$feature configured${End}"
             else
-                echo "${Red}$feature not found${None}"
+                echo -e "${Red}$feature not found${End}"
             fi
         done
 
-    elif [ -n "$stubs" ]
-    then
+    elif [ -n "$stubs" ]; then
 
-        # stubs are selected, configure stubs of the selected features  
+        # stubs are selected, configure stubs of the selected features
         for feature in $features; do
-            echo "${Yellow}Deploying stubs for $feature...${None}"
+            echo -e "${Yellow}Deploying stubs for $feature...${End}"
             $source/src/common-utils/_configure-feature.sh -s $source/src/$feature $feature
-            echo "${Green}Stubs for $feature deployed${None}"
+            echo -e "${Green}Stubs for $feature deployed${End}"
         done
-        
+
     else
         # If inside a container, suggest using devutils as devcontainer features
-        echo "${Purple}You are in a container: use devutils as devcontainer features:${None}"
+        echo -e "${Purple}You are in a container: use devutils as devcontainer features:${End}"
         for feature in $features; do
-            echo "${Purple}ghcr.io/tomgrv/devcontainer-features/$feature${None}"
+            echo -e "${Purple}ghcr.io/tomgrv/devcontainer-features/$feature${End}"
         done
-     
+
     fi
 fi
 

src/common-utils/_configure-feature.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Source colors script
 . zz_colors
@@ -12,7 +12,7 @@ help
 )
 
 if [ -z "$feature" ]; then
-    echo "Usage: configure-feature <feature>"
+    echo -e "Usage: configure-feature <feature>\r"
     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 "Configuring feature <${Purple}$feature${None}>"
-echo "from <$source>"
+echo -e "Configuring feature <${Purple}$feature${None}>\r"
+echo -e "from <$source>\r"
 
 # Go to the module root
 cd "$(git rev-parse --show-toplevel)" >/dev/null
 
 # Deploy stubs if existing
 if [ -d $source/stubs ]; then
 
-    echo "${Blue}Deploy stubs${None}"
+    echo -e "${Blue}Deploy stubs${End}"
 
     find $source/stubs -type f -name ".*" -o -type f | while read file; do
 
@@ -50,14 +50,14 @@ if [ -d $source/stubs ]; then
             # Remove # occurrences in the file path
             dest=$(echo $dest | sed 's/\/\#/\//g')
 
-            echo "Add '$dest' to .gitignore"
+            echo -e "Add '$dest' to .gitignore\r"
 
             # Add to .gitignore if not already there
-            grep -qxF $dest .gitignore || echo "$dest" >>.gitignore
+            grep -qxF $dest .gitignore || echo -e "$dest" >>.gitignore
         fi
 
         # Merge the file
-        echo "${Yellow}Merging '$dest'...${None}"
+        echo -e "${Yellow}Merging '$dest'...${End}"
         git merge-file -p -L current -L base -L stubs $dest /dev/null $file >$dest
 
         # Apply the same permissions as the original file
@@ -67,7 +67,7 @@ if [ -d $source/stubs ]; then
 fi
 
 # Log the merging process
-echo "${Blue}Merge all package folder json files into top level xxx.json${None}"
+echo -e "${Blue}Merge all package folder json files into top level xxx.json${End}"
 
 for package in package composer; do
 
@@ -77,19 +77,19 @@ for package in package composer; do
         echo "{}" >$package.json
     else
         # Pre-sort the existing package.json
-        echo "${Yellow}Pre-merge normalize $package.json${None}"
+        echo -e "${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 "${Yellow}Merge $file in $package.json${None}"
+        echo -e "${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 "${Yellow}Run $file${None}"
+    echo -e "${Yellow}Run $file${End}"
 done

src/common-utils/_install-bin.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Source colors script
 . zz_colors
@@ -9,16 +9,16 @@ eval $(
 )
 
 if [ -z "$feature" ]; then
-    echo "Usage: install-bin <feature>"
+    echo -e "Usage: install-bin <feature>\r"
     exit 1
 fi
 
-echo "Installing bin scripts for <${Purple}$feature${None}>..."
+echo -e "Installing bin scripts for <${Purple}$feature${None}>...\r"
 
 # 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 "${Green}Linked '$file' to '$link'${None}"
+    echo -e "${Green}Linked '$file' to '$link'${End}"
 done

src/common-utils/_install-feature.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Source colors script
 . zz_colors
@@ -9,28 +9,28 @@ eval $(
 )
 
 if [ -z "$feature" ]; then
-    echo "Usage: install-feature <feature>"
+    echo -e "Usage: install-feature <feature>\r"
     exit 1
 fi
 
-echo "Installing feature <${Purple}$feature${None}>..."
+echo -e "Installing feature <${Purple}$feature${None}>...\r"
 
 # Copy stubs to the target directory
 if [ -d $source/stubs ]; then
-    echo "${Blue}Copying stubs to '$target'...${None}"
+    echo -e "${Blue}Copying stubs to '$target'...${End}"
     mkdir -p $target/stubs && cp -r $source/stubs/* $target/stubs
 else
-    echo "${Yellow}No stubs found in '$source'${None}"
+    echo -e "${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 "${Blue}Calling all install scripts in '$source'...${None}"
+echo -e "${Blue}Calling all install scripts in '$source'...${End}"
 find $source -type f -name "install-*.sh" | while read script; do
-    echo "${Yellow}Calling $script...${None}"
+    echo -e "${Yellow}Calling $script...${End}"
     sh $script "$@"
-    echo "${Green}Done!${None}"
+    echo -e "${Green}Done!${End}"
 done