diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-27 14:05:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-27 14:05:46 -0400 |
| commit | 4a97abb8a70d5f09b424987ab1a6db580fca8ca3 (patch) | |
| tree | b7fef14c832a34b999312cd1ab17c9af97f0f017 /Assistant | |
| parent | 2c7a9d4f41c343587ece81f367829d060101b585 (diff) | |
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.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Install.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index 00d719bec..175888e9a 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 |