diff options
| author |  Joey Hess <id@joeyh.name> | 2013-05-14 19:59:14 -0500 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2013-05-14 19:59:14 -0500 |
| commit | c838b0ae045452f693ebdac22b81eb02e06f44d1 (patch) | |
| tree | 58f63c35f3dedea4d46b33875a4080c25bfaa8b1 /Build/Standalone.hs | |
| parent | b3372adb7e6c6dca8809e15278fd83c5ca394322 (diff) | |
windows installer is fully working
Diffstat (limited to 'Build/Standalone.hs')
| -rwxr-xr-x[-rw-r--r--] | Build/Standalone.hs | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/Build/Standalone.hs b/Build/Standalone.hs index aa4521730..343daf9c9 100644..100755 --- a/Build/Standalone.hs +++ b/Build/Standalone.hs @@ -18,7 +18,7 @@ import System.Directory import System.IO import Control.Monad import Data.List -import Build.SysConfig as SysConfig +import Build.BundledPrograms import Utility.PartialPrelude import Utility.Directory @@ -27,32 +27,6 @@ import Utility.Monad import Utility.SafeCommand import Utility.Path -{- Programs that git-annex uses, to include in the bundle. - - - - These may be just the command name, or the full path to it. -} -thirdpartyProgs :: [FilePath] -thirdpartyProgs = catMaybes - [ Just "git" - , Just "cp" - , Just "xargs" - , Just "gpg" - , Just "rsync" - , Just "ssh" - , Just "sh" - , ifset SysConfig.curl "curl" - , ifset SysConfig.wget "wget" - , ifset SysConfig.bup "bup" - , SysConfig.lsof - , SysConfig.sha1 - , SysConfig.sha256 - , SysConfig.sha512 - , SysConfig.sha224 - , SysConfig.sha384 - ] - where - ifset True s = Just s - ifset False _ = Nothing - progDir :: FilePath -> FilePath #ifdef darwin_HOST_OS progDir topdir = topdir @@ -76,5 +50,5 @@ main = getArgs >>= go go (topdir:_) = do let dir = progDir topdir createDirectoryIfMissing True dir - installed <- forM thirdpartyProgs $ installProg dir + installed <- forM bundledPrograms $ installProg dir writeFile "tmp/standalone-installed" (show installed) |