Build system fix for BSD and Darwin

ILOVEPIE · ILOVEPIE · commit c420433504da · 2024-02-09T22:01:15.000-08:00
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -34,26 +34,26 @@ if [ "$NIX_TYPE" = "bsd" ]; then
     if [ "$NIX_SUBTYPE" = "darwin" ]; then
         which brew > /dev/null 2>&1
         if [ $? -ne 0 ]; then
-            echo "Please install the Homebrew package manager." >&2
+            printf '%s\n' "Please install the Homebrew package manager." >&2
             exit 1
         fi
         which gsed > /dev/null 2>&1
         if [ $? -ne 0 ]; then
-            echo "Installing GNU sed..."
+            printf '%s\n' "Installing GNU sed..."
             brew install gsed
         fi
         alias sed="gsed"
     elif [ "$NIX_SUBTYPE" = "bsd" ]; then
         which gsed > /dev/null 2>&1
         if [ $? -ne 0 ]; then
-            echo "Installing GNU sed..."
+            printf '%s\n' "Installing GNU sed..."
             pkg install gsed
         fi
         alias sed="gsed"
     else
         which gsed > /dev/null 2>&1
         if [ $? -ne 0 ]; then
-            echo "Please install GNU sed." >&2
+            printf '%s\n' "Please install GNU sed." >&2
             exit 1
         fi
         alias sed="gsed"
diff --git a/scripts/commands/local-compile.sh b/scripts/commands/local-compile.sh
@@ -6,7 +6,7 @@
 LOG_FILE="$PROJECT_ROOT/compile.log"
 rm -f $LOG_FILE
 if [ ! -f "$TOOL_BIN_DIR/closure.jar" ]; then
-    echo "Closure compiler is not installed, downloading..." > $LOG_FILE
+    printf '%s\n' "Closure compiler is not installed, downloading..." > $LOG_FILE
 #    $SCRIPT_BIN_DIR/helpers/download.sh "$CLOSURE_LATEST" "$TEMP_DIR/closure.tar.gz" 1>>/dev/null 2>>/dev/stdout | tee -a $LOG_FILE | cat 1>&2
     $SCRIPT_BIN_DIR/helpers/download.sh "$CLOSURE_LATEST" "$TEMP_DIR/closure.jar" 1>>/dev/null 2>>/dev/stdout | tee -a $LOG_FILE | cat 1>&2
     TEMPVAR_1="$PWD"
@@ -20,21 +20,21 @@ if [ ! -f "$TOOL_BIN_DIR/closure.jar" ]; then
 fi
 TEMPVAR_1="$PWD"
 cd "$PROJECT_SOURCE_DIR"
-FILES_TO_COMPILE="$(find ./ -type f -name "*.js" ! -name "*.min.js" ! -name "*.test.js" ! -path "*__tests__*" | sed -e "s'^\\./''")"
-FILES_TO_COPY="$(find ./ -type f ! -name ".gitignore" ! -name "*.js" ! -name "*.min.js" ! -name "*.test.js" ! -path "*__tests__*" | sed -e "s'^\\./''")"
-FILE_COUNT=$(echo "$FILES_TO_COMPILE" | wc -l | awk '{$1=$1};1')
+FILES_TO_COMPILE="$(find ./ -type f -name "*.js" ! -name "*.min.js" ! -name "*.test.js" ! -path "*__tests__*" | sed -e "s'^\\./*''")"
+FILES_TO_COPY="$(find ./ -type f ! -name ".gitignore" ! -name "*.js" ! -name "*.min.js" ! -name "*.test.js" ! -path "*__tests__*" | sed -e "s'^\\./*''")"
+FILE_COUNT=$(printf '%s\n' "$FILES_TO_COMPILE" | wc -l | awk '{$1=$1};1')
 cd "$TEMPVAR_1"
 unset TEMPVAR_1
 
 for f in $FILES_TO_COMPILE
 do
     if $SCRIPT_BIN_DIR/helpers/file-modification-test.sh test "$f" $FILE_COUNT; then
-        OUTPUT_FILE="$BIN_DIR/$(echo "$f" | sed -n 's|\.js|.min.js|p')"
+        OUTPUT_FILE="$BIN_DIR/$(printf '%s\n' "$f" | sed -n 's|\.js|.min.js|p')"
         OUTPUT_FILE_DEBUG="$DEBUG_BIN_DIR/$f"
-        OUTPUT_SOURCEMAP="$BIN_DIR/$(echo "$f" | sed -n 's|\.js|.map|p')"
+        OUTPUT_SOURCEMAP="$BIN_DIR/$(printf '%s\n' "$f" | sed -n 's|\.js|.map|p')"
         rm -rf "$OUTPUT_FILE" > /dev/null 2>&1
-        echo "Packaging debug version of $f as $OUTPUT_FILE_DEBUG..." | tee -a $LOG_FILE
-        echo "Compiling $f as $OUTPUT_FILE..." | tee -a $LOG_FILE
+        printf '%s\n' "Packaging debug version of $f as $OUTPUT_FILE_DEBUG..." | tee -a $LOG_FILE
+        printf '%s\n' "Compiling $f as $OUTPUT_FILE..." | tee -a $LOG_FILE
         mkdir -p "$(dirname "$OUTPUT_FILE")/"
         mkdir -p "$(dirname "$OUTPUT_FILE_DEBUG")/"
         if [ ! -f "$PROJECT_INCLUDE_DIR/$f" ]; then
@@ -45,35 +45,35 @@ do
         SOURCE_CODE="$(cat "$PROJECT_SOURCE_DIR/$f")"
 
         WRAPPER="$CLOSURE_OUTPUT_WRAPPER_PREFIX$FILE_COUNT$CLOSURE_OUTPUT_WRAPPER_SUFFIX"
-        DEBUG_PREFIX="$(echo "$WRAPPER" | sed 's/^\(.*\)%output%.*$/\1/g')"
-        DEBUG_SUFFIX="$(echo "$WRAPPER" | sed 's/^.*%output%\(.*\)$/\1/g')"
+        DEBUG_PREFIX="$(printf '%s\n' "$WRAPPER" | sed 's/^\(.*\)%output%.*$/\1/g')"
+        DEBUG_SUFFIX="$(printf '%s\n' "$WRAPPER" | sed 's/^.*%output%\(.*\)$/\1/g')"
         
 		INCLUDE_LIST="--externs '$PROJECT_INCLUDE_DIR/shared.include.js' --externs '$PROJECT_INCLUDE_DIR/sabre.js'"
-		FILES_TO_INCLUDE="$(echo "$SOURCE_CODE" | grep -E "//@include \[..*?\]" | sed -E "s|//@include \[(..*?)\]|\1.js|g" | tr '\r\n' ' ' | tr '\n' ' ')"
-        SOURCE_CODE_DEBUG="$(echo "const DEBUG=true;"; echo "$SOURCE_CODE" | sed -E 's~//@include \[(..*?)\]~if(typeof require !== "function"){sabre.import("\1");}else{require("./\1.js");}~g')"
-        SOURCE_CODE_BUILD="$(echo "const DEBUG=false;"; echo "$SOURCE_CODE" | sed -E 's~//@include \[(..*?)\]~if(typeof require !== "function"){sabre.import("\1");}else{require("./\1.min.js");}~g')"
+		FILES_TO_INCLUDE="$(printf '%s\n' "$SOURCE_CODE" | grep -E "//@include \[..*?\]" | sed -E "s|//@include \[(..*?)\]|\1.js|g" | tr '\r\n' ' ' | tr '\n' ' ')"
+        SOURCE_CODE_DEBUG="$(printf '%s\n' "const DEBUG=true;"; printf '%s\n' "$SOURCE_CODE" | sed -E 's~//@include \[(..*?)\]~if(typeof require !== "function"){sabre.import("\1");}else{require("./\1.js");}~g')"
+        SOURCE_CODE_BUILD="$(printf '%s\n' "const DEBUG=false;"; printf '%s\n' "$SOURCE_CODE" | sed -E 's~//@include \[(..*?)\]~if(typeof require !== "function"){sabre.import("\1");}else{require("./\1.min.js");}~g')"
 
-        echo "$DEBUG_PREFIX" > "$OUTPUT_FILE_DEBUG"
-        echo "$SOURCE_CODE_DEBUG" >> "$OUTPUT_FILE_DEBUG"
-        echo "$DEBUG_SUFFIX" >> "$OUTPUT_FILE_DEBUG"
+        printf '%s\n' "$DEBUG_PREFIX" > "$OUTPUT_FILE_DEBUG"
+        printf '%s\n' "$SOURCE_CODE_DEBUG" >> "$OUTPUT_FILE_DEBUG"
+        printf '%s\n' "$DEBUG_SUFFIX" >> "$OUTPUT_FILE_DEBUG"
 		
         for include in $FILES_TO_INCLUDE
 		do
 			if [ ! "$include" = "$f" ]; then
 				INCLUDE_LIST="$INCLUDE_LIST --externs '$PROJECT_INCLUDE_DIR/$include'"
 			fi
 		done
-        echo "$SOURCE_CODE_BUILD" | $SCRIPT_BIN_DIR/helpers/execute-java.sh -jar "\"$TOOL_BIN_DIR/closure.jar\"" $CLOSURE_TYPE_INF --jscomp_off=unknownDefines --jscomp_off=globalThis --jscomp_error=visibility --assume_function_wrapper --compilation_level=$CLOSURE_COMPILATION_LEVEL --warning_level=$CLOSURE_LOGGING_DETAIL --language_in=$CLOSURE_INPUT_LANGUAGE_VERSION --language_out=$CLOSURE_OUTPUT_LANGUAGE_VERSION --use_types_for_optimization=$CLOSURE_ENABLE_TYPED_OPTIMIZATION --assume_function_wrapper --output_wrapper="\"$CLOSURE_OUTPUT_WRAPPER_PREFIX$FILE_COUNT$CLOSURE_OUTPUT_WRAPPER_SUFFIX\"" $INCLUDE_LIST --js - --create_source_map "\"$OUTPUT_SOURCEMAP\"" --js_output_file "\"$OUTPUT_FILE\"" 2>&1 | $SCRIPT_BIN_DIR/helpers/error_formatter.sh closure "$PROJECT_SOURCE_DIR/$f" | tee -a $LOG_FILE
+        printf '%s\n' "$SOURCE_CODE_BUILD" | $SCRIPT_BIN_DIR/helpers/execute-java.sh -jar "\"$TOOL_BIN_DIR/closure.jar\"" $CLOSURE_TYPE_INF --jscomp_off=unknownDefines --jscomp_off=globalThis --jscomp_error=visibility --assume_function_wrapper --compilation_level=$CLOSURE_COMPILATION_LEVEL --warning_level=$CLOSURE_LOGGING_DETAIL --language_in=$CLOSURE_INPUT_LANGUAGE_VERSION --language_out=$CLOSURE_OUTPUT_LANGUAGE_VERSION --use_types_for_optimization=$CLOSURE_ENABLE_TYPED_OPTIMIZATION --assume_function_wrapper --output_wrapper="\"$CLOSURE_OUTPUT_WRAPPER_PREFIX$FILE_COUNT$CLOSURE_OUTPUT_WRAPPER_SUFFIX\"" $INCLUDE_LIST --js - --create_source_map "\"$OUTPUT_SOURCEMAP\"" --js_output_file "\"$OUTPUT_FILE\"" 2>&1 | $SCRIPT_BIN_DIR/helpers/error_formatter.sh closure "$PROJECT_SOURCE_DIR/$f" | tee -a $LOG_FILE
         
         sed -i "s|$OUTPUT_FILE|$(basename $OUTPUT_FILE)|g" "$OUTPUT_SOURCEMAP"
         sed -i "s|stdin|$(basename $f)|g" "$OUTPUT_SOURCEMAP"
         
         $SCRIPT_BIN_DIR/helpers/execute-toolscript.sh editsourcemap.js "$OUTPUT_SOURCEMAP" "$OUTPUT_SOURCEMAP" "$f" 1:0 0:0  2>&1 | tee -a $LOG_FILE
 
-        echo "" >> "$OUTPUT_FILE"
-        echo "//# sourceMappingURL=$(basename "$OUTPUT_SOURCEMAP")" >> "$OUTPUT_FILE"
+        printf '%s\n' "" >> "$OUTPUT_FILE"
+        printf '%s\n' "//# sourceMappingURL=$(basename "$OUTPUT_SOURCEMAP")" >> "$OUTPUT_FILE"
     else
-        echo "$f was not modified and theirfore was not recompiled." | tee -a $LOG_FILE
+        printf '%s\n' "$f was not modified and theirfore was not recompiled." | tee -a $LOG_FILE
     fi
 done
 for f in $FILES_TO_COPY
diff --git a/scripts/commands/local-debug.sh b/scripts/commands/local-debug.sh
@@ -7,5 +7,5 @@ rm -f $LOG_FILE
 find "$TEST_DIR/" \( -type f -and -name "*.js" \) -or \( -type f -and -name "*.glsl" \) -or \( -type f -and -name "*.map" \) | xargs rm -f > /dev/null 2>&1
 false | cp -r -i $DEBUG_BIN_DIR/* "$TEST_DIR" > /dev/null 2>&1
 false | cp -r -i $BIN_DIR/* "$TEST_DIR" > /dev/null 2>&1
-echo "$(xdg-open "http://localhost:8081" 2>&1 > /dev/null || kde-open "http://localhost:8081" 2>&1 > /dev/null || gnome-open "http://localhost:8081" 2>&1 > /dev/null)" > /dev/null 2>&1 &
+printf '%s\n' "$(xdg-open "http://localhost:8081" 2>&1 > /dev/null || kde-open "http://localhost:8081" 2>&1 > /dev/null || gnome-open "http://localhost:8081" 2>&1 > /dev/null)" > /dev/null 2>&1 &
 $SCRIPT_BIN_DIR/helpers/execute-node.sh http-server "$TEST_DIR" -p 8081 -r --cors --no-dotfiles | tee -a "$LOG_FILE"
diff --git a/scripts/commands/npm-package.sh b/scripts/commands/npm-package.sh
@@ -6,7 +6,7 @@ RESULT_NEW=0
 RESULT_CODE=0
 LOG_FILE="$PROJECT_ROOT/packaging.log"
 rm -f $LOG_FILE
-echo "Creating NPM Package..." | tee -a $LOG_FILE
+printf '%s\n' "Creating NPM Package..." | tee -a $LOG_FILE
 rm -rf "$TEMP_DIR/sabre"
 RESULT_NEW=$?
 if [ $RESULT_CODE -ne 0 ]; then
@@ -47,5 +47,5 @@ RESULT_NEW=$?
 if [ $RESULT_CODE -ne 0 ]; then
     RESULT_CODE=$RESULT_NEW
 fi
-echo "Finished creating NPM Package..." | tee -a $LOG_FILE
+printf '%s\n' "Finished creating NPM Package..." | tee -a $LOG_FILE
 exit $RESULT_CODE 
diff --git a/scripts/commands/pre-commit.sh b/scripts/commands/pre-commit.sh
@@ -6,24 +6,24 @@ RESULT_NEW=0
 RESULT_CODE=0
 LOG_FILE="$PROJECT_ROOT/pre-commit.log"
 rm -f $LOG_FILE
-echo "Running pre-commit hook..." | tee -a $LOG_FILE
-echo "Running pretty-quick..." | tee -a $LOG_FILE
+printf '%s\n' "Running pre-commit hook..." | tee -a $LOG_FILE
+printf '%s\n' "Running pretty-quick..." | tee -a $LOG_FILE
 $SCRIPT_BIN_DIR/helpers/execute-node.sh pretty-quick --staged | tee -a $LOG_FILE
 RESULT_NEW=$?
 if [ $RESULT_CODE -ne 0 ]; then
     RESULT_CODE=$RESULT_NEW
 fi
-echo "Running eslint..." | tee -a $LOG_FILE
+printf '%s\n' "Running eslint..." | tee -a $LOG_FILE
 $SCRIPT_BIN_DIR/helpers/execute-node.sh lint-staged | tee -a $LOG_FILE
 RESULT_NEW=$?
 if [ $RESULT_CODE -ne 0 ]; then
     RESULT_CODE=$RESULT_NEW
 fi
-echo "Running tests..." | tee -a $LOG_FILE
+printf '%s\n' "Running tests..." | tee -a $LOG_FILE
 $SCRIPT_BIN_DIR/helpers/execute-node.sh jest -o | tee -a $LOG_FILE
 RESULT_NEW=$?
 if [ $RESULT_CODE -ne 0 ]; then
     RESULT_CODE=$RESULT_NEW
 fi
-echo "Finished pre-commit hook..." | tee -a $LOG_FILE
+printf '%s\n' "Finished pre-commit hook..." | tee -a $LOG_FILE
 exit $RESULT_CODE 
diff --git a/scripts/commands/test.sh b/scripts/commands/test.sh
@@ -3,7 +3,7 @@
 . "$SCRIPT_BIN_DIR/defines/tools-defines.sh"
 
 LOG_FILE="$PROJECT_ROOT/test.log"
-echo "Running tests..." | tee -a $LOG_FILE
+printf '%s\n' "Running tests..." | tee -a $LOG_FILE
 $SCRIPT_BIN_DIR/helpers/execute-node.sh jest | tee -a $LOG_FILE
 RESULT_CODE=$?
 exit $RESULT_CODE
diff --git a/scripts/helpers/error_formatter.sh b/scripts/helpers/error_formatter.sh
@@ -7,25 +7,25 @@ FORMATTER=$1
 default(){
     while read -r input_line
     do
-        echo "$input_line"
+        printf '%s\n' "$input_line"
     done
 }
 
 closure_error_formatter(){
     STATE=0
     while IFS= read -r input_line
     do
-        input_line="$(echo "$input_line" | sed "s'stdin'$1'")"
+        input_line="$(printf '%s\n' "$input_line" | sed "s'stdin'$1'")"
         if [ $STATE -eq 0 ]; then
-            if (echo "$input_line" | grep -Eq "^\\s*.*?:[0-9]+:\\s+WARNING|ERROR\\s+-\\s+\\[.*?\\]\\s+.*\$"); then
+            if (printf '%s\n' "$input_line" | grep -Eq "^\\s*.*?:[0-9]+:\\s+WARNING|ERROR\\s+-\\s+\\[.*?\\]\\s+.*\$"); then
                 STATE=1
             fi
-            echo "$input_line"
+            printf '%s\n' "$input_line"
         elif [ $STATE -eq 1 ]; then
             STATE=2
         else
             STATE=0
-            echo "    $(echo "$input_line" | sed "s/^\(\\s*\)\\^*/\1/" | wc -c | awk '{$1=$1};1')->$(echo "$input_line" | wc -c | awk '{$1=$1};1')"
+            printf '%s\n' "    $(printf '%s\n' "$input_line" | sed "s/^\(\\s*\)\\^*/\1/" | wc -c | awk '{$1=$1};1')->$(printf '%s\n' "$input_line" | wc -c | awk '{$1=$1};1')"
         fi
     done
 }
@@ -35,7 +35,7 @@ case $FORMATTER in
         closure_error_formatter $2
         ;;
     *)
-        echo "ERROR: Unknown error formatter" 1>&2
+        printf '%s\n' "ERROR: Unknown error formatter" 1>&2
         default
         ;;
 esac
diff --git a/scripts/helpers/execute-java.sh b/scripts/helpers/execute-java.sh
@@ -29,14 +29,14 @@ elif [ ! -x "$(command -v java)" -a -x "$(command -v mono)" ]; then
     mv -f ./ikvm "$TOOL_BIN_DIR/ikvm_files"
     cd "$TEMPVAR_1"
     unset TEMPVAR_1
-    echo "#!/bin/sh" > "$TOOL_BIN_DIR/ikvm"
-    echo "mono --gc=sgen \"\$(dirname \"\$(readlink -f \"\$0\")\")/ikvm_files/bin/ikvm.exe\" \$@" >> "$TOOL_BIN_DIR/ikvm"
+    printf '%s\n' "#!/bin/sh" > "$TOOL_BIN_DIR/ikvm"
+    printf '%s\n' "mono --gc=sgen \"\$(dirname \"\$(readlink -f \"\$0\")\")/ikvm_files/bin/ikvm.exe\" \$@" >> "$TOOL_BIN_DIR/ikvm"
     chmod +x "$TOOL_BIN_DIR/ikvm"
 elif ! [ -x "$(command -v java)" ]; then
-    echo "JVM not present and mono-runtime is not installed, please install one or the other."
+    printf '%s\n' "JVM not present and mono-runtime is not installed, please install one or the other."
     exit 3
 fi
-#echo "Compile Command: \"$USED_JVM $JVM_SETTINGS $@\""
+#printf '%s\n' "Compile Command: \"$USED_JVM $JVM_SETTINGS $@\""
 eval "$USED_JVM $JVM_SETTINGS $@"
 RESULT_CODE=$?
 
diff --git a/scripts/helpers/execute-node.sh b/scripts/helpers/execute-node.sh
@@ -4,7 +4,7 @@
 
 if [ ! -d "$TOOL_BIN_DIR/node_tools" ]; then 
     mkdir "$TOOL_BIN_DIR/node_tools" > /dev/null 2>&1
-    echo $NPM_PACKAGES | xargs npm install --prefix "$TOOL_BIN_DIR/node_tools" --save-dev --save-exact
+    printf '%s\n' $NPM_PACKAGES | xargs npm install --prefix "$TOOL_BIN_DIR/node_tools" --save-dev --save-exact
 fi
 
 NODE_TOOLS_BINDIR="$TOOL_BIN_DIR/node_tools/node_modules/.bin"
diff --git a/scripts/helpers/execute-toolscript.sh b/scripts/helpers/execute-toolscript.sh
@@ -4,7 +4,7 @@
 
 if [ ! -d "$TOOL_BIN_DIR/node_tools" ]; then 
     mkdir "$TOOL_BIN_DIR/node_tools" > /dev/null 2>&1
-    echo $NPM_PACKAGES | xargs npm install --prefix "$TOOL_BIN_DIR/node_tools" --save-dev --save-exact
+    printf '%s\n' $NPM_PACKAGES | xargs npm install --prefix "$TOOL_BIN_DIR/node_tools" --save-dev --save-exact
 fi
 
 export NODE_PATH="$NODE_PATH:$TOOL_BIN_DIR/node_tools/node_modules"
diff --git a/scripts/helpers/file-modification-test.sh b/scripts/helpers/file-modification-test.sh
@@ -19,7 +19,7 @@ if [ "$1" = "test" ]; then
     fi
     for MODIFICATION_PAIR in $(cat "$TOOL_DATA_DIR/changes.cfg")
     do
-        set -- `echo $MODIFICATION_PAIR | tr '=' ' '`
+        set -- `printf '%s\n' $MODIFICATION_PAIR | tr '=' ' '`
         if [ "$1" = "/COUNT" ]; then
             if [ "$2" -ne "$FILE_COUNT" ]; then
                 exit 0
@@ -32,15 +32,15 @@ if [ "$1" = "test" ]; then
     exit 0
 elif [ "$1" = "init" ]; then
     FILES_TO_SCAN="$2"
-    FILE_COUNT=$(echo "$FILES_TO_SCAN" | wc -l | awk '{$1=$1};1')
+    FILE_COUNT=$(printf '%s\n' "$FILES_TO_SCAN" | wc -l | awk '{$1=$1};1')
     rm -f "$TOOL_DATA_DIR/changes.cfg"
     touch "$TOOL_DATA_DIR/changes.cfg"
     TEMPVAR_1="$PWD"
     cd "$PROJECT_SOURCE_DIR"
-    echo "/COUNT=$FILE_COUNT" >> "$TOOL_DATA_DIR/changes.cfg"
+    printf '%s\n' "/COUNT=$FILE_COUNT" >> "$TOOL_DATA_DIR/changes.cfg"
     for f in $FILES_TO_SCAN
     do
-        echo "$f=$(stat $FORMAT_OPTION $FORMAT_TYPE $f)" >> "$TOOL_DATA_DIR/changes.cfg"
+        printf '%s\n' "$f=$(stat $FORMAT_OPTION $FORMAT_TYPE $f)" >> "$TOOL_DATA_DIR/changes.cfg"
     done
     cd "$TEMPVAR_1"
     unset TEMPVAR_1
