From 36671f5c992905aa71722b16d800313f60a02622 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 5 Jul 2017 16:46:36 -0400 Subject: add Overwrite configuration --- src/Propellor/Property/XFCE.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs index a1b9d7d7..e0c062ae 100644 --- a/src/Propellor/Property/XFCE.hs +++ b/src/Propellor/Property/XFCE.hs @@ -15,13 +15,12 @@ installedMin :: Property DebianLike installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"] `describe` "minimal XFCE desktop installed" +data Overwrite = OverwriteExisting | PreserveExisting + -- | Normally at first login, XFCE asks what kind of panel the user wants. -- This enables the default configuration noninteractively. --- --- If the user subsequently modifies their panel, their modifications will --- not be overwritten by this property. -defaultPanelFor :: User -> Property DebianLike -defaultPanelFor u@(User username) = property' desc $ \w -> do +defaultPanelFor :: User -> Overwrite -> Property DebianLike +defaultPanelFor u@(User username) overwrite = property' desc $ \w -> do home <- liftIO $ User.homedir u ensureProperty w (go home) where @@ -31,10 +30,13 @@ defaultPanelFor u@(User username) = property' desc $ \w -> do -- This location is probably Debian-specific. defcf = "/etc/xdg/xfce4/panel/default.xml" go :: FilePath -> Property DebianLike - go home = tightenTargets $ check (not <$> doesFileExist cf) $ + go home = tightenTargets $ checkoverwrite cf cf `File.isCopyOf` defcf `before` File.applyPath home basecf (\f -> File.ownerGroup f u (userGroup u)) `requires` Apt.installed ["xfce4-panel"] where cf = home basecf + checkoverwrite cf p = case overwrite of + OverwriteExisting -> p + PreserveExisting -> check (not <$> doesFileExist cf) p -- cgit v1.3-2-g0d8e