a7840c0e04
Fixes a failure mode where git-annex sync would try to run git-annex and complain that it failed to find it in ~/.config/git-annex/program or PATH, when there was a git-annex in /usr/bin/, but the original one was run from elsewhere (eg, ~/bin) and happened not to be present any longer. Now, it will fall back to using git-annex from PATH in such a case. Which might fail due to some version incompatability, but still better than a misleading error message. Also made readProgramFile only read the file, not look for git-annex in PATH as a fallback. That fallback may have confused Assistant.Upgrade, which really wants the value from the file.
47 lines
1.4 KiB
Haskell
47 lines
1.4 KiB
Haskell
{- git-annex program path
|
|
-
|
|
- Copyright 2013 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Annex.Path where
|
|
|
|
import Common
|
|
import Config.Files
|
|
import Utility.Env
|
|
|
|
import System.Environment (getExecutablePath)
|
|
|
|
{- A fully qualified path to the currently running git-annex program.
|
|
-
|
|
- getExecutablePath is used when possible. On OSs it supports
|
|
- well, it returns the complete path to the program. But, on other OSs,
|
|
- it might return just the basename. Fall back to reading the programFile,
|
|
- or searching for the command name in PATH.
|
|
-
|
|
- The standalone build runs git-annex via ld.so, and defeats
|
|
- getExecutablePath. It sets GIT_ANNEX_PROGRAMPATH to the correct path
|
|
- to the wrapper script to use.
|
|
-}
|
|
programPath :: IO FilePath
|
|
programPath = go =<< getEnv "GIT_ANNEX_PROGRAMPATH"
|
|
where
|
|
go (Just p) = return p
|
|
go Nothing = do
|
|
exe <- getExecutablePath
|
|
p <- if isAbsolute exe
|
|
then return exe
|
|
else fromMaybe exe <$> readProgramFile
|
|
maybe cannotFindProgram return =<< searchPath p
|
|
|
|
{- Returns the path for git-annex that is recorded in the programFile. -}
|
|
readProgramFile :: IO (Maybe FilePath)
|
|
readProgramFile = do
|
|
programfile <- programFile
|
|
headMaybe . lines <$> readFile programfile
|
|
|
|
cannotFindProgram :: IO a
|
|
cannotFindProgram = do
|
|
f <- programFile
|
|
giveup $ "cannot find git-annex program in PATH or in " ++ f
|