diff options
author | Joey Hess <joeyh@debian.org> | 2014-04-02 21:42:53 +0100 |
---|---|---|
committer | Joey Hess <joeyh@debian.org> | 2014-04-02 21:42:53 +0100 |
commit | 6da7cdf0fbf26f1faf7d5710e6ed488f1a4e9589 (patch) | |
tree | 7a903e2eca579335b7ce73d0220854e7a25c3bb9 /git-annex.hs |
git-annex (5.20140402) unstable; urgency=medium
* unannex, uninit: Avoid committing after every file is unannexed,
for massive speedup.
* --notify-finish switch will cause desktop notifications after each
file upload/download/drop completes
(using the dbus Desktop Notifications Specification)
* --notify-start switch will show desktop notifications when each
file upload/download starts.
* webapp: Automatically install Nautilus integration scripts
to get and drop files.
* tahoe: Pass -d parameter before subcommand; putting it after
the subcommand no longer works with tahoe-lafs version 1.10.
(Thanks, Alberto Berti)
* forget --drop-dead: Avoid removing the dead remote from the trust.log,
so that if git remotes for it still exist anywhere, git annex info
will still know it's dead and not show it.
* git-annex-shell: Make configlist automatically initialize
a remote git repository, as long as a git-annex branch has
been pushed to it, to simplify setup of remote git repositories,
including via gitolite.
* add --include-dotfiles: New option, perhaps useful for backups.
* Version 5.20140227 broke creation of glacier repositories,
not including the datacenter and vault in their configuration.
This bug is fixed, but glacier repositories set up with the broken
version of git-annex need to have the datacenter and vault set
in order to be usable. This can be done using git annex enableremote
to add the missing settings. For details, see
http://git-annex.branchable.com/bugs/problems_with_glacier/
* Added required content configuration.
* assistant: Improve ssh authorized keys line generated in local pairing
or for a remote ssh server to set environment variables in an
alternative way that works with the non-POSIX fish shell, as well
as POSIX shells.
# imported from the archive
Diffstat (limited to 'git-annex.hs')
-rw-r--r-- | git-annex.hs | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/git-annex.hs b/git-annex.hs new file mode 100644 index 000000000..a96dd8cbd --- /dev/null +++ b/git-annex.hs @@ -0,0 +1,76 @@ +{- git-annex main program dispatch + - + - Copyright 2010-2014 Joey Hess <joey@kitenet.net> + - + - Licensed under the GNU GPL version 3 or higher. + -} + +{-# LANGUAGE CPP #-} + +import System.Environment (getArgs, getProgName) +import System.FilePath + +import qualified CmdLine.GitAnnex +import qualified CmdLine.GitAnnexShell +#ifdef WITH_TESTSUITE +import qualified Test +#endif + +#ifdef mingw32_HOST_OS +import Utility.UserInfo +import Utility.Env +import Config.Files +import System.Process +import System.Exit +#endif + +main :: IO () +main = do + ps <- getArgs + run ps =<< getProgName + where + run ps n + | isshell n = CmdLine.GitAnnexShell.run ps + | otherwise = +#ifdef mingw32_HOST_OS + winEnv gitannex ps +#else + gitannex ps +#endif + gitannex ps = +#ifdef WITH_TESTSUITE + case ps of + ("test":ps') -> Test.main ps' + _ -> CmdLine.GitAnnex.run ps +#else + CmdLine.GitAnnex.run ps +#endif + isshell n = takeFileName n == "git-annex-shell" + +#ifdef mingw32_HOST_OS +{- On Windows, if HOME is not set, probe it and set it, re-execing + - git-annex with the new environment. + - + - This is a workaround for some Cygwin commands needing HOME to be set, + - and for there being no known way to set environment variables on + - Windows, except by passing an environment in each call to a program. + - While ugly, this workaround is easier than trying to ensure HOME is set + - in all calls to the affected programs. + -} +winEnv :: ([String] -> IO ()) -> [String] -> IO () +winEnv a ps = go =<< getEnv "HOME" + where + go (Just _) = a ps + go Nothing = do + home <- myHomeDir + putStrLn $ "** Windows hack; overrideing HOME to " ++ home + e <- getEnvironment + let eoverride = + [ ("HOME", home) + , ("CYGWIN", "nodosfilewarning") + ] + cmd <- readProgramFile + (_, _, _, pid) <- createProcess (proc cmd ps) + { env = Just $ e ++ eoverride } + exitWith =<< waitForProcess pid +#endif |