Merge pull request #171 from desultory/dev

fix unescaped strings, color consistency

Author: desultory

CONTRIBUTING.md

@@ -14,7 +14,8 @@ Log lines info (20) level or greater should be formatted such that:
 Variables should generally be colored using the following scheme:
 
 * `cyan` for autodetected values
-* `green` for written files
+* `blue` for config/stage info
+* `green` for writted/read files
 * `magenta` for kernel/kmod related things
 * `yellow` when cleaning files/build directories
 * `red` for overrides or warnings

src/ugrd/base/base.py

@@ -179,7 +179,7 @@ def readvar(self) -> str:
 def check_var(self) -> str:
     """Returns a bash function that checks the value of a variable.
     if it's not set, tries to read the cmdline."""
-    return """
+    return r"""
     if [ -z "$(readvar "$1")" ]; then  # preferably the variable is set, because this is slower
         cmdline=$(awk -F '--' '{print $1}' /proc/cmdline)  # Get everything before '--'
         if grep -qE "(^|\s)$1(\s|$)" <<< "$cmdline"; then
@@ -259,7 +259,7 @@ def klog(self) -> str:
 # To feel more at home
 def edebug(self) -> str:
     """Returns a bash function like edebug."""
-    return """
+    return r"""
     if check_var quiet; then
         return
     fi

src/ugrd/initramfs_dict.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "2.3.0"
+__version__ = "2.3.1"
 
 from collections import UserDict
 from pathlib import Path
@@ -226,7 +226,7 @@ def _process_imports(self, import_type: str, import_value: dict) -> None:
                     self["imports"]["custom_init"] = function_list[0]
                     self.logger.info(
                         "Registered custom init function: %s"
-                        % colorize(function_list[0].__name__, "magenta", bold=True)
+                        % colorize(function_list[0].__name__, "blue", bold=True)
                     )
                     continue