twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-07-31 12:11:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #617 from slotThe/runorraise-dir-exe

Browse Source 
X.P.RunOrRaise: Disambiguate directories and executables
This commit is contained in:
slotThe
2021-10-11 20:42:59 +02:00
committed by GitHub
parent b331821275 5bdc5993f9
commit f821a2ec0c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
XMonad/Prompt/RunOrRaise.hs
View File

@@ -22,14 +22,14 @@ module XMonad.Prompt.RunOrRaise
) where ) where
import XMonad hiding (config) import XMonad hiding (config)
import XMonad.Prelude (liftA2) import XMonad.Prelude (isNothing, isSuffixOf, liftA2)
import XMonad.Prompt import XMonad.Prompt
import XMonad.Prompt.Shell import XMonad.Prompt.Shell
import XMonad.Actions.WindowGo (runOrRaise) import XMonad.Actions.WindowGo (runOrRaise)
import XMonad.Util.Run (runProcessWithInput) import XMonad.Util.Run (runProcessWithInput)
import Control.Exception as E import Control.Exception as E
import System.Directory (doesDirectoryExist, doesFileExist, executable, getPermissions) import System.Directory (doesDirectoryExist, doesFileExist, executable, findExecutable, getPermissions)
econst :: Monad m => a -> IOException -> m a econst :: Monad m => a -> IOException -> m a
econst = const . return econst = const . return
@@ -60,9 +60,14 @@ open path = io (isNormalFile path) >>= \b ->
then spawn $ "xdg-open \"" ++ path ++ "\"" then spawn $ "xdg-open \"" ++ path ++ "\""
else uncurry runOrRaise . getTarget $ path else uncurry runOrRaise . getTarget $ path
where where
isNormalFile f = exists f >>= \e -> if e then notExecutable f else return False isNormalFile f = do
exists f = or <$> sequence [doesFileExist f,doesDirectoryExist f] notCommand <- isNothing <$> findExecutable f -- not a command (executable in $PATH)
exists <- or <$> sequence [doesDirExist f, doesFileExist f]
case (notCommand, exists) of
(True, True) -> notExecutable f -- not executable as a file in current dir
_ -> pure False
notExecutable = fmap (not . executable) . getPermissions notExecutable = fmap (not . executable) . getPermissions
doesDirExist f = ("/" `isSuffixOf` f &&) <$> doesDirectoryExist f
getTarget x = (x,isApp x) getTarget x = (x,isApp x)
isApp :: String -> Query Bool isApp :: String -> Query Bool