14f7a386f0
Clean the standalone environment before running the su command to run "sh". Otherwise, PATH leaked through, causing it to run git-annex.linux/bin/sh, but GIT_ANNEX_DIR was not set, which caused that script to not work: [2022-10-26 15:07:02.145466106] (Utility.Process) process [938146] call: pkexec ["sh","-c","cd '/home/joey/tmp/git-annex.linux/r' && '/home/joey/tmp/git-annex.linux/git-annex' 'enable-tor' '1000'"] /home/joey/tmp/git-annex.linux/bin/sh: 4: exec: /exe/sh: not found Changed programPath to not use GIT_ANNEX_PROGRAMPATH, but instead run the scripts at the top of GIT_ANNEX_DIR. That works both when the standalone environment is set up, and when it's not. Sponsored-by: Kevin Mueller on Patreon
125 lines
4 KiB
Haskell
125 lines
4 KiB
Haskell
{- git-annex program path
|
|
-
|
|
- Copyright 2013-2022 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Annex.Path (
|
|
programPath,
|
|
readProgramFile,
|
|
gitAnnexChildProcess,
|
|
gitAnnexChildProcessParams,
|
|
gitAnnexDaemonizeParams,
|
|
cleanStandaloneEnvironment,
|
|
) where
|
|
|
|
import Annex.Common
|
|
import Config.Files
|
|
import Utility.Env
|
|
import Annex.PidLock
|
|
import qualified Annex
|
|
|
|
import System.Environment (getExecutablePath, getArgs, getProgName)
|
|
|
|
{- 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_DIR to the location of the
|
|
- standalone build directory, and there are wrapper scripts for git-annex
|
|
- and git-annex-shell in that directory.
|
|
-}
|
|
programPath :: IO FilePath
|
|
programPath = go =<< getEnv "GIT_ANNEX_DIR"
|
|
where
|
|
go (Just dir) = do
|
|
name <- getProgName
|
|
return (dir </> name)
|
|
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
|
|
|
|
{- Runs a git-annex child process.
|
|
-
|
|
- Like runsGitAnnexChildProcessViaGit, when pid locking is in use,
|
|
- this takes the pid lock, while running it, and sets an env var
|
|
- that prevents the child process trying to take the pid lock,
|
|
- to avoid it deadlocking.
|
|
-}
|
|
gitAnnexChildProcess
|
|
:: String
|
|
-> [CommandParam]
|
|
-> (CreateProcess -> CreateProcess)
|
|
-> (Maybe Handle -> Maybe Handle -> Maybe Handle -> ProcessHandle -> IO a)
|
|
-> Annex a
|
|
gitAnnexChildProcess subcmd ps f a = do
|
|
cmd <- liftIO programPath
|
|
ps' <- gitAnnexChildProcessParams subcmd ps
|
|
pidLockChildProcess cmd ps' f a
|
|
|
|
{- Parameters to pass to a git-annex child process to run a subcommand
|
|
- with some parameters.
|
|
-
|
|
- Includes -c values that were passed on the git-annex command line
|
|
- or due to options like --debug being enabled.
|
|
-}
|
|
gitAnnexChildProcessParams :: String -> [CommandParam] -> Annex [CommandParam]
|
|
gitAnnexChildProcessParams subcmd ps = do
|
|
cps <- gitAnnexGitConfigOverrides
|
|
return (Param subcmd : cps ++ ps)
|
|
|
|
gitAnnexGitConfigOverrides :: Annex [CommandParam]
|
|
gitAnnexGitConfigOverrides = concatMap (\c -> [Param "-c", Param c])
|
|
<$> Annex.getGitConfigOverrides
|
|
|
|
{- Parameters to pass to git-annex when re-running the current command
|
|
- to daemonize it. Used with Utility.Daemon.daemonize. -}
|
|
gitAnnexDaemonizeParams :: Annex [CommandParam]
|
|
gitAnnexDaemonizeParams = do
|
|
-- This inclues -c parameters passed to git, as well as ones
|
|
-- passed to git-annex.
|
|
cps <- gitAnnexGitConfigOverrides
|
|
-- Get every parameter git-annex was run with.
|
|
ps <- liftIO getArgs
|
|
return (map Param ps ++ cps)
|
|
|
|
{- Returns a cleaned up environment that lacks path and other settings
|
|
- used to make the standalone builds use their bundled libraries and programs.
|
|
- Useful when calling programs not included in the standalone builds.
|
|
-
|
|
- For a non-standalone build, returns Nothing.
|
|
-}
|
|
cleanStandaloneEnvironment :: IO (Maybe [(String, String)])
|
|
cleanStandaloneEnvironment = clean <$> getEnvironment
|
|
where
|
|
clean environ
|
|
| null vars = Nothing
|
|
| otherwise = Just $ catMaybes $ map (restoreorig environ) environ
|
|
where
|
|
vars = words $ fromMaybe "" $
|
|
lookup "GIT_ANNEX_STANDLONE_ENV" environ
|
|
restoreorig oldenviron p@(k, _v)
|
|
| k `elem` vars = case lookup ("ORIG_" ++ k) oldenviron of
|
|
(Just v')
|
|
| not (null v') -> Just (k, v')
|
|
_ -> Nothing
|
|
| otherwise = Just p
|