e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
73 lines
1.8 KiB
Haskell
73 lines
1.8 KiB
Haskell
{- Bundled programs
|
|
-
|
|
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
module Build.BundledPrograms where
|
|
|
|
import Data.Maybe
|
|
|
|
import Build.SysConfig as SysConfig
|
|
|
|
{- Programs that git-annex uses, to include in the bundle.
|
|
-
|
|
- These may be just the command name, or the full path to it. -}
|
|
bundledPrograms :: [FilePath]
|
|
bundledPrograms = catMaybes
|
|
[ Nothing
|
|
#ifndef mingw32_HOST_OS
|
|
-- git is not included in the windows bundle
|
|
, Just "git"
|
|
-- Not strictly needed in PATH by git-annex, but called
|
|
-- by git when it sshes to a remote.
|
|
, Just "git-upload-pack"
|
|
, Just "git-receive-pack"
|
|
, Just "git-shell"
|
|
#endif
|
|
, Just "cp"
|
|
#ifndef mingw32_HOST_OS
|
|
-- using xargs on windows led to problems, so it's not used there
|
|
, Just "xargs"
|
|
#endif
|
|
, Just "rsync"
|
|
#ifndef darwin_HOST_OS
|
|
-- OS X has ssh installed by default.
|
|
-- (Linux probably, but not guaranteed.)
|
|
, Just "ssh"
|
|
, Just "ssh-keygen"
|
|
#endif
|
|
#ifndef mingw32_HOST_OS
|
|
, Just "sh"
|
|
#endif
|
|
, SysConfig.gpg
|
|
, ifset SysConfig.curl "curl"
|
|
#ifndef darwin_HOST_OS
|
|
-- wget on OSX has been problimatic, looking for certs in the wrong
|
|
-- places. Don't ship it, use curl or the OSX's own wget if it has
|
|
-- one.
|
|
, ifset SysConfig.wget "wget"
|
|
#endif
|
|
, ifset SysConfig.bup "bup"
|
|
, SysConfig.lsof
|
|
, SysConfig.gcrypt
|
|
, SysConfig.sha1
|
|
, SysConfig.sha256
|
|
, SysConfig.sha512
|
|
, SysConfig.sha224
|
|
, SysConfig.sha384
|
|
#ifdef linux_HOST_OS
|
|
-- used to unpack the tarball when upgrading
|
|
, Just "gunzip"
|
|
, Just "tar"
|
|
#endif
|
|
-- nice, ionice, and nocache are not included in the bundle;
|
|
-- we rely on the system's own version, which may better match
|
|
-- its kernel, and avoid using them if not available.
|
|
]
|
|
where
|
|
ifset True s = Just s
|
|
ifset False _ = Nothing
|