Merge branch 'master' into prompt-pass-specify

CHANGES.md

@@ -99,6 +99,11 @@
     - Added new versions of the `pass` functions that allow user-specified
       prompts.
 
+  * `XMonad.Prompt.AppendFile`
+
+    - Use `XMonad.Prelude.mkAbsolutePath` to force names to be relative to the
+      home directory and support `~/` prefixes.
+
   * `XMonad.Prompt.OrgMode`
 
     - Fixes the date parsing issue such that entries with format of
@@ -189,6 +194,10 @@
     - Added `WindowScreen`, which is a type synonym for the specialized `Screen`
       type, that results from the `WindowSet` definition in `XMonad.Core`.
 
+    - Modified `mkAbsolutePath` to support a leading environment variable, so
+      things like `$HOME/NOTES` work. If you want more general environment
+      variable support, comment on [this PR].
+
   * `XMonad.Util.XUtils`
 
     - Added `withSimpleWindow`, `showSimpleWindow`, `WindowConfig`, and
@@ -226,6 +235,8 @@
 
     - Added a `Default` instance for `UrgencyConfig` and `DzenUrgencyHook`.
 
+[this PR]: https://github.com/xmonad/xmonad-contrib/pull/744
+
 ### Other changes
 
   * Migrated the sample build scripts from the deprecated `xmonad-testing` repo to

XMonad/Prelude.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE BangPatterns        #-}
 {-# LANGUAGE LambdaCase          #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 --------------------------------------------------------------------
 -- |
 -- Module      :  XMonad.Prelude
@@ -60,6 +61,8 @@ import Data.List.NonEmpty (NonEmpty ((:|)))
 import Data.Tuple (swap)
 import GHC.Stack
 import System.Directory (getHomeDirectory)
+import System.Environment (getEnv)
+import Control.Exception (SomeException, handle)
 import qualified XMonad.StackSet as W
 
 -- | Short for 'fromIntegral'.
@@ -80,7 +83,7 @@ chunksOf i xs = chunk : chunksOf i rest
 (!?) xs n | n < 0 = Nothing
           | otherwise = listToMaybe $ drop n xs
 
--- | Multivariant composition.
+-- | Multivariable composition.
 --
 -- > f .: g ≡ (f .) . g ≡ \c d -> f (g c d)
 (.:) :: (a -> b) -> (c -> d -> a) -> c -> d -> b
@@ -108,14 +111,19 @@ safeGetWindowAttributes w = withDisplay $ \dpy -> io . alloca $ \p ->
 -- * If it starts with @~\/@, replace that with the actual home
 -- * directory.
 --
--- * Otherwise, prepend a @\/@ to the path.
+-- * If it starts with @$@, read the name of an environment
+-- * variable and replace it with the contents of that.
+--
+-- * Otherwise, prepend the home directory and @\/@ to the path.
 mkAbsolutePath :: MonadIO m => FilePath -> m FilePath
 mkAbsolutePath ps = do
-  home <- liftIO getHomeDirectory
+  home <- io getHomeDirectory
-  pure $ case ps of
+  case ps of
-    '/'       : _ ->                ps
+    '/'       : _ -> pure ps
-    '~' : '/' : _ -> home <> drop 1 ps
+    '~' : '/' : _ -> pure (home <> drop 1 ps)
-    _             -> home <> ('/' : ps)
+    '$'       : _ -> let (v,ps') = span (`elem` ("_"<>['A'..'Z']<>['a'..'z']<>['0'..'9'])) (drop 1 ps)
+                      in io ((\(_ :: SomeException) -> pure "") `handle` getEnv v) Exports.<&> (<> ps')
+    _             -> pure (home <> ('/' : ps))
 {-# SPECIALISE mkAbsolutePath :: FilePath -> IO FilePath #-}
 {-# SPECIALISE mkAbsolutePath :: FilePath -> X  FilePath #-}
 

XMonad/Prompt/AppendFile.hs

@@ -30,6 +30,7 @@ module XMonad.Prompt.AppendFile (
 
 import XMonad.Core
 import XMonad.Prompt
+import XMonad.Prelude (mkAbsolutePath)
 
 import System.IO
 
@@ -91,4 +92,4 @@ appendFilePrompt' c trans fn = mkXPrompt (AppendFile fn)
 
 -- | Append a string to a file.
 doAppend :: (String -> String) -> FilePath -> String -> X ()
-doAppend trans fn = io . withFile fn AppendMode . flip hPutStrLn . trans
+doAppend trans fn s = mkAbsolutePath fn >>= \f -> (io . withFile f AppendMode . flip hPutStrLn . trans) s