Merge pull request #179 from desultory/dev

use printf instead of echo -e for more shell compatibility

Author: desultory

src/ugrd/base/base.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "6.1.2"
+__version__ = "6.2.0"
 
 from pathlib import Path
 
@@ -207,11 +207,11 @@ def prompt_user(self) -> list[str]:
             "if plymouth --ping; then",
             '    plymouth display-message --text="$prompt"',
             "else",
-            r'    echo -e "\e[1;35m *\e[0m $prompt"',
+            r'    printf "\e[1;35m *\e[0m $prompt"',
             "fi",
         ]
     else:
-        output += [r'echo -e "\e[1;35m *\e[0m $prompt"']
+        output += [r'printf "\e[1;35m *\e[0m $prompt"']
     output += [
         'if [ -n "$2" ]; then',
         '    read -t "$2" -rs && return 0 || return 1',
@@ -266,7 +266,7 @@ def edebug(self) -> str:
     if [ "$(readvar debug)" != "1" ]; then
         return
     fi
-    echo -e "\e[1;34m *\e[0m ${*}"
+    printf "\e[1;34m *\e[0m ${*}"
     """
 
 
@@ -282,7 +282,7 @@ def einfo(self) -> list[str]:
     else:
         output = []
 
-    output += ["if check_var quiet; then", "    return", "fi", r'echo -e "\e[1;32m *\e[0m ${*}"']
+    output += ["if check_var quiet; then", "    return", "fi", r'printf "\e[1;32m *\e[0m ${*}"']
     return output
 
 
@@ -304,7 +304,7 @@ def ewarn(self) -> list[str]:
         "if check_var quiet; then",
         "    return",
         "fi",
-        r'echo -e "\e[1;33m *\e[0m ${*}"',
+        r'printf "\e[1;33m *\e[0m ${*}"',
     ]
     return output
 
@@ -317,7 +317,7 @@ def eerror(self) -> str:
             plymouth display-message --text="Error: ${*}"
             return
         fi
-        echo -e "\e[1;31m *\e[0m ${*}"
+        printf "\e[1;31m *\e[0m ${*}"
         """
     else:
-        return r'echo -e "\e[1;31m *\e[0m ${*}"'
+        return r'printf "\e[1;31m *\e[0m ${*}"'

src/ugrd/fs/fakeudev.py

@@ -16,6 +16,6 @@ def fake_dm_udev(self) -> str:
         source "${dm}/uevent"
         einfo "Faking udev for: ${DEVNAME}"
         udev_db_file="/run/udev/data/b${MAJOR}:${MINOR}"
-        echo -e 'E:DM_UDEV_PRIMARY_SOURCE_FLAG=1\n' > "${udev_db_file}"
+        printf 'E:DM_UDEV_PRIMARY_SOURCE_FLAG=1\n' > "${udev_db_file}"
     done
     """