work around git/environment/gecos/android suck
I don't know why, but I can't seem to set the environment variables inside git-annex to work around the git error caused by android's crappy username and hostname settings. This workaround works, and that's all that's good about it.
This commit is contained in:
parent
1b3b1675ab
commit
543ffa5b9f
2 changed files with 23 additions and 16 deletions
|
@ -5,6 +5,8 @@
|
|||
- Licensed under the GNU GPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Annex.Environment where
|
||||
|
||||
import Common.Annex
|
||||
|
@ -27,8 +29,14 @@ checkEnvironmentIO :: IO ()
|
|||
checkEnvironmentIO = do
|
||||
whenM (null <$> myUserGecos) $ do
|
||||
username <- myUserName
|
||||
-- existing environment is not overwritten
|
||||
setEnv "GIT_AUTHOR_NAME" username False
|
||||
setEnv "GIT_COMMITTER_NAME" username False
|
||||
hostname <- getHostName
|
||||
setEnv "EMAIL" (username ++ "@" ++ hostname) False
|
||||
ensureEnv "GIT_AUTHOR_NAME" username
|
||||
ensureEnv "GIT_COMMITTER_NAME" username
|
||||
where
|
||||
#ifndef __ANDROID__
|
||||
-- existing environment is not overwritten
|
||||
ensureEnv var val = setEnv var val False
|
||||
#else
|
||||
-- Environment setting is broken on Android, so this is dealt with
|
||||
-- in runshell instead.
|
||||
ensureEnv _ _ = noop
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue