87d5583a91
Improve git-annex's ability to find the path to its program, especially when it needs to run itself in another repo to upgrade it. Some parts of the code used readProgramFile, probably because I forgot that programPath exists. I noticed this when a git-annex auto-upgrade failed because it was running git-annex upgrade --autoonly, but the code to run git-annex used readProgramFile, which happened to point to an older build of git-annex.
57 lines
1.5 KiB
Haskell
57 lines
1.5 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 readProgramFile
|
|
maybe cannotFindProgram return =<< searchPath p
|
|
|
|
{- Returns the path for git-annex that is recorded in the programFile. -}
|
|
readProgramFile :: IO FilePath
|
|
readProgramFile = do
|
|
programfile <- programFile
|
|
p <- catchDefaultIO cmd $
|
|
fromMaybe cmd . headMaybe . lines <$> readFile programfile
|
|
ifM (inPath p)
|
|
( return p
|
|
, ifM (inPath cmd)
|
|
( return cmd
|
|
, cannotFindProgram
|
|
)
|
|
)
|
|
where
|
|
cmd = "git-annex"
|
|
|
|
cannotFindProgram :: IO a
|
|
cannotFindProgram = do
|
|
f <- programFile
|
|
giveup $ "cannot find git-annex program in PATH or in " ++ f
|