From 951c833873f99f469133a1cfed38c21e2923bd9b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 4 Jul 2020 11:07:02 -0400 Subject: more fixquoting --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 9d0948a0..e7bcaa1b 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=" ] @@ -1319,9 +1319,9 @@ autoMountDrivePort label hp drive malias = propertyList desc $ props -- and the vendor is not sufficient since I have 2 -- hubs from the same vendor. So search for the -- drive in its output to determine it. - [ "$(uhubctl | awk -F '[: ]' '/Current status for hub/{u=$5}/" + [ "$(uhubctl | awk -F '[: ]' '/Current status for hub/{u=\\\\$5}/" , driveVendorId drive ++ ":" ++ driveProductId drive - , "/{print u})'" + , "/{print u}')" ] ] -- cgit v1.2.3