Add is_shell_path arg to escape_string overrides

Add check and key conversion for shell pathed key based on arg Signed-off-by: amorphousWaste <20346603+amorphousWaste@users.noreply.github.com>
AcademySoftwareFoundation · Sep 15, 2023 · c55ee1b · c55ee1b
1 parent 640e44c
commit c55ee1b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/rezplugins/shell/_utils/powershell_base.py b/src/rezplugins/shell/_utils/powershell_base.py
@@ -226,7 +226,7 @@ def get_output(self, style=OutputStyle.file):
             script = '&& '.join(lines)
         return script
 
-    def escape_string(self, value, is_path=False):
+    def escape_string(self, value, is_path=False, is_shell_path=False):
         value = EscapedString.promote(value)
         value = value.expanduser()
         result = ''
@@ -237,6 +237,8 @@ def escape_string(self, value, is_path=False):
             else:
                 if is_path:
                     txt = self.normalize_paths(txt)
+                elif is_shell_path:
+                    txt = self.as_shell_path(txt)
 
                 txt = self._escape_quotes(txt)
             result += txt

diff --git a/src/rezplugins/shell/cmd.py b/src/rezplugins/shell/cmd.py
@@ -217,14 +217,18 @@ def get_output(self, style=OutputStyle.file):
             script = '&& '.join(lines)
         return script
 
-    def escape_string(self, value, is_path=False):
+    def escape_string(self, value, is_path=False, is_shell_path=False):
         """Escape the <, >, ^, and & special characters reserved by Windows.
 
+        is_path and is_shell_path are mutally exclusive.
+
         Args:
             value (str/EscapedString): String or already escaped string.
 
         Returns:
-            str: The value escaped for Windows.
+            value (str): The value escaped for Windows.
+            is_path (bool): True if the value is path-like.
+            is_shell_path (bool): True if the value is a shell-path.
 
         """
         value = EscapedString.promote(value)
@@ -239,6 +243,8 @@ def escape_string(self, value, is_path=False):
             else:
                 if is_path:
                     txt = self.normalize_paths(txt)
+                elif is_shell_path:
+                    txt = self.as_shell_path(txt)
 
                 txt = self._escaper(txt)
             result += txt

diff --git a/src/rezplugins/shell/csh.py b/src/rezplugins/shell/csh.py
@@ -98,7 +98,7 @@ def get_startup_sequence(cls, rcfile, norc, stdin, command):
             source_bind_files=(not norc)
         )
 
-    def escape_string(self, value, is_path=False):
+    def escape_string(self, value, is_path=False, is_shell_path=False):
         value = EscapedString.promote(value)
         value = value.expanduser()
         result = ''
@@ -110,7 +110,9 @@ def escape_string(self, value, is_path=False):
                     txt = "'%s'" % txt
             else:
                 if is_path:
-                    txt = self.normalize_paths(txt)
+                    txt = self.as_path(txt)
+                elif is_shell_path:
+                    txt = self.as_shell_path(txt)
 
                 txt = txt.replace('"', '"\\""')
                 txt = txt.replace('!', '\\!')

diff --git a/src/rezplugins/shell/sh.py b/src/rezplugins/shell/sh.py
@@ -119,7 +119,7 @@ def source(self, value):
         value = self.escape_string(value)
         self._addline('. %s' % value)
 
-    def escape_string(self, value, is_path=False):
+    def escape_string(self, value, is_path=False, is_shell_path=False):
         value = EscapedString.promote(value)
         value = value.expanduser()
         result = ''
@@ -132,11 +132,15 @@ def escape_string(self, value, is_path=False):
             else:
                 if is_path:
                     txt = self.normalize_paths(txt)
+                    # txt = self.as_path(txt)
+                elif is_shell_path:
+                    txt = self.as_shell_path(txt)
 
                 txt = txt.replace('\\', '\\\\')
                 txt = txt.replace('"', '\\"')
                 txt = '"%s"' % txt
             result += txt
+
         return result
 
     def _saferefenv(self, key):