Changeset 614fd92 in rattail-fabric2

Timestamp:

11/01/2022 06:41:27 PM (3 months ago)

Author:

Lance Edgar <lance@…>

Branches:

master

Children:

46440b6

Parents:

a2dca4e

Message:

Use shlex.join() when adding postfix alias

a bit convoluted perhaps, but still better...

File:

• rattail_fabric2/postfix.py (modified) (3 diffs)

rattail_fabric2/postfix.py

@@ -3 +3 @@
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2019 Lance Edgar
+#  Copyright © 2010-2022 Lance Edgar
 #
 #  This file is part of Rattail.
@@ -25 +25 @@
 """
 
+import shlex
+
 from rattail_fabric2 import apt
 
@@ -43 +45 @@
     if c.run("grep '^{}:' /etc/aliases".format(name), warn=True).failed:
         # append new entry
-        c.sudo("""bash -c 'echo "{}: {}" >> /etc/aliases'""".format(name, alias_to))
+        entry = '{}: {}'.format(name, alias_to)
+        echo = shlex.join(['echo', entry])
+        cmd = '{} >> /etc/aliases'.format(echo)
+        cmd = shlex.join(['bash', '-c', cmd])
+        c.sudo(cmd)
     else:
         # update existing entry
-        c.sudo('sed -i.bak -e "s/^{}: .*/{}: {}/" /etc/aliases'.format(name, name, alias_to))
+        alias_to = alias_to.replace('|', '\\|')
+        sub = "s|^{}: .*|{}: {}|".format(name, name, alias_to)
+        cmd = shlex.join(['sed', '-i.bak', '-E', sub, '/etc/aliases'])
+        c.sudo(cmd)
 
     c.sudo('newaliases')