xiwrap

commit

f98161cb1fe91a861536dadd3264918e1ca97869

parent

ebd43e64811c84d572ee4caa3e75d04bad0e0f84

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2024-06-20 17:20

re-enable arbitrary env vars in expandvars

GUI needs WAYLAND_DISPLAY

Diffstat

1 files changed, 8 insertions, 1 deletions

diff --git a/xiwrap.py b/xiwrap.py

@@ -55,7 +55,7 @@ class RuleError(ValueError):
   55    55         super().__init__(f'Invalid rule: {rule}')
   56    56 
   57    57 
   58    -1 def expandvars(path, env):
   -1    58 def xdg_expandvars(path, env):
   59    59     # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
   60    60 
   61    61     if not path.startswith('$'):
@@ -89,6 +89,11 @@ def expandvars(path, env):
   89    89     raise ValueError(f'Invalid path {path}')
   90    90 
   91    91 
   -1    92 def expandvars(path, env):
   -1    93     path = xdg_expandvars(path, env)
   -1    94     return os.path.expandvars(path)
   -1    95 
   -1    96 
   92    97 class RuleSet:
   93    98     def __init__(self):
   94    99         self.env = {}
@@ -291,9 +296,11 @@ if __name__ == '__main__':
  291   296     except ValueError:
  292   297         print(USAGE)
  293   298         sys.exit(1)
   -1   299 
  294   300     cmd = rules.build(tail)
  295   301     dbus_system_cmd = rules.build_dbus_system()
  296   302     dbus_session_cmd = rules.build_dbus_session()
   -1   303 
  297   304     if rules.usage:
  298   305         print(USAGE)
  299   306     elif rules.debug: