Merge pull request #191 from desultory/dev

improve POSIX shell compatibility, fix quoting

Author: desultory

src/ugrd/base/base.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "6.3.1"
+__version__ = "6.3.3"
 
 from pathlib import Path
 
@@ -183,7 +183,7 @@ def setvar(self) -> str:
     if check_var debug; then
         edebug "Setting $1 to $2"
     fi
-    echo -n "$2" > "/run/vars/${1}"
+    printf "%s" "$2" > "/run/vars/${1}"
     """
 
 
@@ -221,11 +221,11 @@ def wait_enter(self) -> str:
     """
     return r"""
     tty_env=$(stty -g)
-    t=$(printf "%.0f" $(echo "${1:-0} * 10" | bc))
+    t=$(printf "%.0f" "$(echo "${1:-0} * 10" | bc)")
     if [ "$t" -gt 300 ]; then
         stty raw -echo min 0 time 300
     elif [ "$t" -gt 0 ]; then
-        stty raw -echo min 0 time $t
+        stty raw -echo min 0 time "$t"
     else
         stty raw -echo
     fi

src/ugrd/crypto/cryptsetup.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "4.0.1"
+__version__ = "4.0.2"
 
 from pathlib import Path
 
@@ -428,14 +428,14 @@ def get_crypt_dev(self) -> str:
     source_token="$(readvar CRYPTSETUP_TOKEN_"$1")"
     if [ -n "$source_dev" ]; then
         if [ -e "$source_dev" ]; then
-            echo -n "$source_dev"
+            printf "%s" "$source_dev"
             return
         fi
     fi
     if [ -n "$source_token" ]; then
         source_dev=$(blkid --match-token "$source_token" --output device)
         if [ -n "$source_dev" ]; then
-            echo -n "$source_dev"
+            printf "%s" "$source_dev"
         fi
     fi
     if [ -z "$source_dev" ]; then

src/ugrd/fs/btrfs.py

@@ -1,4 +1,4 @@
-__version__ = "1.12.3"
+__version__ = "1.12.4"
 __author__ = "desultory"
 
 from pathlib import Path
@@ -115,7 +115,7 @@ def select_subvol(self) -> str:
                     ewarn 'Invalid selection'
                 else
                     einfo "Selected subvolume: $subvol"
-                    echo -n ",subvol=$subvol" >> /run/vars/MOUNTS_ROOT_OPTIONS
+                    printf "%s" ",subvol=$subvol" >> /run/vars/MOUNTS_ROOT_OPTIONS
                     break
                 fi
                 ;;
@@ -130,4 +130,4 @@ def select_subvol(self) -> str:
 def set_root_subvol(self) -> str:
     """Adds the root_subvol to the root_mount options."""
     _validate_root_subvol(self)
-    return f"""echo -n ",subvol={self['root_subvol']}" >> /run/vars/MOUNTS_ROOT_OPTIONS"""
+    return f"""printfs ",subvol={self['root_subvol']}" >> /run/vars/MOUNTS_ROOT_OPTIONS"""

src/ugrd/fs/resume.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 
 def handle_resume(self) -> None:
@@ -24,7 +24,7 @@ def handle_resume(self) -> None:
         "    fi",
         '    if [ -e "$resume" ]; then',  # Check if the resume device exists
         '        einfo "Resuming from: $resume"',
-        '        echo -n "$resume" > /sys/power/resume',  # Attempt to resume
+        '        printf "%s" "$resume" > /sys/power/resume',  # Attempt to resume
         '        ewarn "Failed to resume from: $resume"',
         "    else",
         '        ewarn "Resume device not found: $resume)"',  # Warn if the resume device does not exist