From 30f0052ae0d9aad34f5fd067d422ea437820c855 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Apr 2016 14:05:46 -0400 Subject: [PATCH] make assistant not write wrappers when GIT_ANNEX_PACKAGE_INSTALL is set This way, the git-annex-standalone.deb, which does set GIT_ANNEX_APP_BASE, will not have the assistant install wrappers that it does not need to, since git-annex is installed system wide from a package. --- Assistant/Install.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assistant/Install.hs b/Assistant/Install.hs index 00d719becc..175888e9ad 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -43,7 +43,10 @@ standaloneAppBase = getEnv "GIT_ANNEX_APP_BASE" - packaged apps, since it has to go into the user's home directory. -} ensureInstalled :: IO () -ensureInstalled = go =<< standaloneAppBase +ensureInstalled = ifM (isJust <$> getEnv "GIT_ANNEX_PACKAGE_INSTALL") + ( go Nothing + , go =<< standaloneAppBase + ) where go Nothing = installFileManagerHooks "git-annex" go (Just base) = do