fix: 🐛 end of lines and colors

Author: Thomas G.

src/common-utils/_normalize-json.sh

@@ -20,7 +20,7 @@ help
 
 # Check if JSON exists and is readable
 if test -z "$json" && test ! -f "$json"; then
-    echo -e "${Red}JSON is missing${End}"
+    echo "${Red}JSON is missing${End}" >&2
     exit 1
 fi
 
@@ -106,14 +106,14 @@ get_path() {
             gsub("\\["; ".") | gsub("\\]"; "") | split(".") | map(
                 select(length > 0) | gsub("^\"|\"$";"") | if test("^[0-9]+$") then tonumber else . end
             );
-        getpath($path | split_path)'
+        getpath($path | split_path)' 2>/dev/null
 }
 
 # Function to get remove comments from JSON.
 # Do not remove comments inside strings.
 load_json() {
     local file=${1:--}
-    sed -e 's:^[[:blank:]]*//.*$::g' $file
+    sed -e 's:^[[:blank:]]*//.*$::g' $file 2>/dev/null
 }
 
 load_json_schema() {
@@ -165,7 +165,7 @@ get_schema_json() {
     curl -s $url | load_json_schema $url -
 
     if [ $? -ne 0 ]; then
-        echo -e "${Red}Unable to download schema file $schema${End}" >&2
+        echo "${Red}Unable to download schema file $schema${End}" >&2
         exit 1
     fi
 }
@@ -190,7 +190,7 @@ get_schema() {
 
     # if schema is not a valid JSON, return error
     if ! is_json <<<"$schema"; then
-        echo -e "${Red}Invalid schema${End}" >&2
+        echo "${Red}Invalid schema${End}" >&2
         exit 1
     fi
 
@@ -255,7 +255,7 @@ validate() {
 
     # if schema is not a valid JSON, return error
     if ! is_json <<<"$json"; then
-        echo -e "${Red}Invalid json${End}" >&2
+        echo "${Red}Invalid json${End}" >&2
         exit 1
     fi
 
@@ -286,7 +286,7 @@ validate() {
     fi
 
     # Log
-    echo -e "${lvl}${Blue}Parsing schema <${path:-.}> == <${real:-.}>${None} at level <$level>\r" >&2
+    echo -e "${lvl}${Blue}Parsing schema <${path:-.}> == <${real:-.}>${None} at level <$level>${End}" >&2
 
     # get 1st level entry points (oneOf, allOf, anyOf, properties) and loop through them
     for entry in '"$id"' '"not"' '"oneOf"' '"allOf"' '"anyOf"' '"type"' '"required"' '"$ref"' '"properties"' '"items"' '"additionalProperties"'; do
@@ -296,7 +296,7 @@ validate() {
             continue
         fi
 
-        echo -e "${lvl}- Processing <${Blue}${path}:$entry${None}>\r" >&2
+        echo -e "${lvl}- Processing <${Blue}${path}:$entry${None}>${End}" >&2
 
         case $entry in
 
@@ -318,32 +318,32 @@ validate() {
             local ref=$(get_path "$path.$entry" <<<"$schema")
 
             if test "$ref" == "null" || test -z "$ref"; then
-                echo -e "${Red}Reference not found for $path.$entry${End}" >&2
+                echo "${Red}Reference not found for $path.$entry${End}" >&2
                 exit 1
             fi
 
             echo -e "${lvl}- Ref is ${Yellow}${ref}${End}" >&2
-            echo -e "${lvl}  From ${Yellow}${id}${None}...\r" >&2
+            echo -e "${lvl}  From ${Yellow}${id}${None}...${End}" >&2
 
             # separate uri before # from fragment after #
             local uri=$(echo $ref | awk -F '#' '{print $1}')
             local fgt=$(echo $ref | awk -F '#' '{print $2}')
 
             # if ref is a url, download it and use it as schema
             if test -n "$(echo $uri | grep -E '^http')"; then
-                echo -e "${lvl}- Loading ${Yellow}${uri}${None}...\r" >&2
+                echo -e "${lvl}- Loading ${Yellow}${uri}${None}...${End}" >&2
                 schema=$(get_schema_json $uri)
             elif test -n "$uri"; then
                 # check if file exists
                 if test -f "$uri"; then
-                    echo -e "${lvl}- Loading ${Yellow}${uri}${None}...\r" >&2
+                    echo -e "${lvl}- Loading ${Yellow}${uri}${None}...${End}" >&2
                     schema=$(load_json_schema $uri)
                 elif test -n "$id"; then
                     # load schema from file
-                    echo -e "${lvl}- Loading ${Yellow}$(dirname $id)/$uri${None}...\r" >&2
+                    echo -e "${lvl}- Loading ${Yellow}$(dirname $id)/$uri${None}...${End}" >&2
                     schema=$(get_schema_json $(dirname $id)/$uri)
                 else
-                    echo -e "${Red}Unable to resolve reference $ref with $id${End}" >&2
+                    echo "${Red}Unable to resolve reference $ref with $id${End}" >&2
                     exit 1
                 fi
 
@@ -373,7 +373,7 @@ validate() {
         \"oneOf\" | \"allOf\" | \"anyOf\")
 
             if ! is_json_array "$path.$entry" <<<"$schema"; then
-                echo -e "${Red}Invalid $entry schema${End}" >&2
+                echo "${Red}Invalid $entry schema${End}" >&2
                 exit 1
             fi
 
@@ -504,20 +504,20 @@ validate() {
             props=$(get_keys "$path.$entry" <<<"$schema" | tr "\n" " ")
 
             # Log
-            #echo -e "${lvl}- Properties are ${Purple}$props${End}" >&2
+            #echo  "${lvl}- Properties are ${Purple}$props${End}" >&2
 
             # Loop through properties
             for prop in $props; do
 
-                #echo -e "${lvl}- Processing property ${Purple}$prop${End}" >&2
+                #echo  "${lvl}- Processing property ${Purple}$prop${End}" >&2
                 if $not is_existing_path "$real.$prop" <<<"$json"; then
 
                     # Log
-                    echo -e "${lvl}- Processing <${Purple}$prop${None}>\r" >&2
+                    echo -e "${lvl}- Processing <${Purple}$prop${None}>${End}" >&2
 
                     # Parse sub schema
                     if ! validate "$json" "$schema" "$path.$entry.$prop" "$real.$prop" "$path.$entry.$prop" "$not" "$level"; then
-                        echo -e "${Red}Property $prop is present but invalid${Red}" >&2
+                        echo "${Red}Property $prop is present but invalid${Red}" >&2
                         return 1
                     fi
                 else
@@ -526,7 +526,7 @@ validate() {
                 fi
             done
 
-            echo -e "${real:-.}"
+            echo "${real:-.}"
             ;;
 
         \"additionalProperties\")
@@ -539,10 +539,10 @@ validate() {
                 for prop in $(get_keys "$real" <<<"$json" | sort); do
 
                     if ! grep -q "$prop" <<<"$props"; then
-                        echo -e "${lvl}- Adding additional property <${Purple}$real.$prop${None}>\r" >&2
+                        echo -e "${lvl}- Adding additional property <${Purple}$real.$prop${None}>${End}" >&2
 
                         # Keep track of validated path
-                        echo -e "$real.$prop"
+                        echo "$real.$prop"
                     fi
                 done
             fi
@@ -564,7 +564,7 @@ if [ -n "$local" ]; then
     schema=$local/_$type.schema.json
 
     # log
-    echo -e "${Yellow}Infering schema from local folder for ${UYellow}$json${End}" >&2
+    echo "${Yellow}Infering schema from local folder for ${UYellow}$json${End}" >&2
 fi
 
 # Check if schema file exists, and if not and import allowed, download it from schema store
@@ -576,7 +576,7 @@ if [ -n "$import" ] && [ ! -f "$schema" ]; then
     schema=$(get_schema_url $search)
 
     # log
-    echo -e "${Yellow}Infering schema from schema store for ${UYellow}$search${Yellow} ${schema:+"found!"}${End}" >&2
+    echo "${Yellow}Infering schema from schema store for ${UYellow}$search${Yellow} ${schema:+"found!"}${End}" >&2
 fi
 
 # if schema file does not exist, use fallback schema
@@ -591,17 +591,17 @@ if [ -n "$fallback" ] && [ -z "$schema" ]; then
     elif [ -f "$fallback" ]; then
         schema=$fallback
     else
-        echo -e "${Red}Fallback schema $fallback not found${End}" >&2
+        echo "${Red}Fallback schema $fallback not found${End}" >&2
         exit 1
     fi
 
     # log
-    echo -e "${Yellow}Using fallback schema ${UYellow}$schema${End}" >&2
+    echo "${Yellow}Using fallback schema ${UYellow}$schema${End}" >&2
 fi
 
 # Check if schema is readable
 if test -z "$schema"; then
-    echo -e "${Red}Schema is missing${End}" >&2
+    echo "${Red}Schema is missing${End}" >&2
     exit 1
 fi
 
@@ -611,9 +611,9 @@ schema=$(get_schema "$schema" "" "$allow")
 # Strip comments from JSON and go through normalization
 # if parse "$json" "$schema" >/dev/null; then ## Uncomment this line to enable debug output
 if validate "$json" "$schema"; then
-    echo -e "${Green}JSON is valid and normalized${End}" >&2
+    echo "${Green}JSON is valid and normalized${End}" >&2
 else
-    echo -e "${Red}JSON is empty or invalid${End}" >&2
+    echo "${Red}JSON is empty or invalid${End}" >&2
     exit 1
 fi >/tmp/$$.json
 

src/common-utils/_zz_colors.sh

@@ -1,73 +1,73 @@
 # Reset
-export None='\033[0m'       # Text Reset
-export End='\033[0m\n'       # Text Reset
+export None='\033[0m'  # Text Reset
+export End='\033[0m\r' # Text Reset
 
 # Regular Colors
-export Black='\033[0;30m'        # Black
-export Red='\033[0;31m'          # Red
-export Green='\033[0;32m'        # Green
-export Yellow='\033[0;33m'       # Yellow
-export Blue='\033[0;34m'         # Blue
-export Purple='\033[0;35m'       # Purple
-export Cyan='\033[0;36m'         # Cyan
-export White='\033[0;37m'        # White
+export Black='\033[0;30m'  # Black
+export Red='\033[0;31m'    # Red
+export Green='\033[0;32m'  # Green
+export Yellow='\033[0;33m' # Yellow
+export Blue='\033[0;34m'   # Blue
+export Purple='\033[0;35m' # Purple
+export Cyan='\033[0;36m'   # Cyan
+export White='\033[0;37m'  # White
 
 # Bold
-export BBlack='\033[1;30m'       # Black
-export BRed='\033[1;31m'         # Red
-export BGreen='\033[1;32m'       # Green
-export BYellow='\033[1;33m'      # Yellow
-export BBlue='\033[1;34m'        # Blue
-export BPurple='\033[1;35m'      # Purple
-export BCyan='\033[1;36m'        # Cyan
-export BWhite='\033[1;37m'       # White
+export BBlack='\033[1;30m'  # Black
+export BRed='\033[1;31m'    # Red
+export BGreen='\033[1;32m'  # Green
+export BYellow='\033[1;33m' # Yellow
+export BBlue='\033[1;34m'   # Blue
+export BPurple='\033[1;35m' # Purple
+export BCyan='\033[1;36m'   # Cyan
+export BWhite='\033[1;37m'  # White
 
 # Underline
-export UBlack='\033[4;30m'       # Black
-export URed='\033[4;31m'         # Red
-export UGreen='\033[4;32m'       # Green
-export UYellow='\033[4;33m'      # Yellow
-export UBlue='\033[4;34m'        # Blue
-export UPurple='\033[4;35m'      # Purple
-export UCyan='\033[4;36m'        # Cyan
-export UWhite='\033[4;37m'       # White
+export UBlack='\033[4;30m'  # Black
+export URed='\033[4;31m'    # Red
+export UGreen='\033[4;32m'  # Green
+export UYellow='\033[4;33m' # Yellow
+export UBlue='\033[4;34m'   # Blue
+export UPurple='\033[4;35m' # Purple
+export UCyan='\033[4;36m'   # Cyan
+export UWhite='\033[4;37m'  # White
 
 # Background
-export On_Black='\033[40m'       # Black
-export On_Red='\033[41m'         # Red
-export On_Green='\033[42m'       # Green
-export On_Yellow='\033[43m'      # Yellow
-export On_Blue='\033[44m'        # Blue
-export On_Purple='\033[45m'      # Purple
-export On_Cyan='\033[46m'        # Cyan
-export On_White='\033[47m'       # White
+export On_Black='\033[40m'  # Black
+export On_Red='\033[41m'    # Red
+export On_Green='\033[42m'  # Green
+export On_Yellow='\033[43m' # Yellow
+export On_Blue='\033[44m'   # Blue
+export On_Purple='\033[45m' # Purple
+export On_Cyan='\033[46m'   # Cyan
+export On_White='\033[47m'  # White
 
 # High Intensity
-export IBlack='\033[0;90m'       # Black
-export IRed='\033[0;91m'         # Red
-export IGreen='\033[0;92m'       # Green
-export IYellow='\033[0;93m'      # Yellow
-export IBlue='\033[0;94m'        # Blue
-export IPurple='\033[0;95m'      # Purple
-export ICyan='\033[0;96m'        # Cyan
-export IWhite='\033[0;97m'       # White
+export IBlack='\033[0;90m'  # Black
+export IRed='\033[0;91m'    # Red
+export IGreen='\033[0;92m'  # Green
+export IYellow='\033[0;93m' # Yellow
+export IBlue='\033[0;94m'   # Blue
+export IPurple='\033[0;95m' # Purple
+export ICyan='\033[0;96m'   # Cyan
+export IWhite='\033[0;97m'  # White
 
 # Bold High Intensity
-export BIBlack='\033[1;90m'      # Black
-export BIRed='\033[1;91m'        # Red
-export BIGreen='\033[1;92m'      # Green
-export BIYellow='\033[1;93m'     # Yellow
-export BIBlue='\033[1;94m'       # Blue
-export BIPurple='\033[1;95m'     # Purple
-export BICyan='\033[1;96m'       # Cyan
-export BIWhite='\033[1;97m'      # White
+export BIBlack='\033[1;90m'  # Black
+export BIRed='\033[1;91m'    # Red
+export BIGreen='\033[1;92m'  # Green
+export BIYellow='\033[1;93m' # Yellow
+export BIBlue='\033[1;94m'   # Blue
+export BIPurple='\033[1;95m' # Purple
+export BICyan='\033[1;96m'   # Cyan
+export BIWhite='\033[1;97m'  # White
 
 # High Intensity backgrounds
-export On_IBlack='\033[0;100m'   # Black
-export On_IRed='\033[0;101m'     # Red
-export On_IGreen='\033[0;102m'   # Green
-export On_IYellow='\033[0;103m'  # Yellow
-export On_IBlue='\033[0;104m'    # Blue
-export On_IPurple='\033[0;105m'  # Purple
-export On_ICyan='\033[0;106m'    # Cyan
-export On_IWhite='\033[0;107m'   # White
+export On_IBlack='\033[0;100m'  # Black
+export On_IRed='\033[0;101m'    # Red
+export On_IGreen='\033[0;102m'  # Green
+export On_IYellow='\033[0;103m' # Yellow
+export On_IBlue='\033[0;104m'   # Blue
+export On_IPurple='\033[0;105m' # Purple
+export On_ICyan='\033[0;106m'   # Cyan
+export On_IWhite='\033[0;107m'  # White

src/common-utils/devcontainer-feature.json

@@ -1,14 +1,12 @@
 {
     "name": "Common Utils",
-    "version": "3.3.12",
+    "version": "3.3.14",
     "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",
@@ -51,4 +49,4 @@
             ]
         }
     }
-}
+}