summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2020-07-04 10:46:57 -0400
committerJoey Hess2020-07-04 10:46:57 -0400
commit409da579296e8b3e5959231396c99bb6ab5d2ec4 (patch)
tree48e9fa01ed3de78f37febb70e0b9099bf0cfdac4
parent3739f053f0e3f4ee0dd9026298529df44eeb4a25 (diff)
fix shell quoting
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 5e80e130..9d0948a0 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1285,8 +1285,8 @@ autoMountDrivePort label hp drive malias = propertyList desc $ props
, "[Service]"
, "Type=oneshot"
, "RemainAfterExit=true"
- , "ExecStart=/bin/sh -c 'uhubctl -a on " ++ selecthubport ++ "'"
- , "ExecStop=/bin/sh -c 'uhubctl -a off " ++ selecthubport
+ , "ExecStart=/bin/sh -c \"uhubctl -a on " ++ selecthubport ++ "\""
+ , "ExecStop=/bin/sh -c \"uhubctl -a off " ++ selecthubport
-- Powering off the port does not remove device
-- files, so ask udev to remove the devfile; it will
-- be added back after the drive next spins up
@@ -1294,7 +1294,7 @@ autoMountDrivePort label hp drive malias = propertyList desc $ props
-- spun up.
-- (This only works when the devfile is in
-- by-label.)
- ++ "; udevadm trigger --action=remove " ++ devfile ++ " || true'"
+ ++ "; udevadm trigger --action=remove " ++ devfile ++ " || true\""
, "[Install]"
, "WantedBy="
]
@@ -1321,7 +1321,7 @@ autoMountDrivePort label hp drive malias = propertyList desc $ props
-- drive in its output to determine it.
[ "$(uhubctl | awk -F '[: ]' '/Current status for hub/{u=$5}/"
, driveVendorId drive ++ ":" ++ driveProductId drive
- , "/{print u})"
+ , "/{print u})'"
]
]