mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows installer: Always install to 64 bit program files directory, since it needs 64 bit git now

Browse source 
I saw the installer not defaulting to any installation directory,
and I had to manually enter C:\Program Files\Git

Maybe it was choosing gitInstallDir32, and that was empty? Or the
conditional somehow failed. Simplifying so it will hopefully work again.
This commit is contained in:
Joey Hess 2019-08-07 14:05:03 -04:00
parent bf5dd723d3
commit 30ca02928c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Build/NullSoftInstaller.hs
View file

@ -94,10 +94,7 @@ gitInstallDir64 :: Exp FilePath
gitInstallDir64 = fromString "$PROGRAMFILES64\\Git" gitInstallDir64 = fromString "$PROGRAMFILES64\\Git"
gitInstallDir :: Exp FilePath gitInstallDir :: Exp FilePath
gitInstallDir = fileExists gitInstallDir32 ? gitInstallDir = gitInstallDir64
( gitInstallDir32
, fileExists gitInstallDir64 ? (gitInstallDir64, gitInstallDir32)
)
-- This intentionally has a different name than git-annex or -- This intentionally has a different name than git-annex or
-- git-annex-webapp, since it is itself treated as an executable file. -- git-annex-webapp, since it is itself treated as an executable file.

2
CHANGELOG
View file

@ -11,6 +11,8 @@ git-annex (7.20190731) UNRELEASED; urgency=medium
* Allow setting up a gcrypt special remote with encryption=shared. * Allow setting up a gcrypt special remote with encryption=shared.
* Fix querying git for object type when operating on a file containing * Fix querying git for object type when operating on a file containing
newlines. newlines.
* Windows installer: Always install to 64 bit program files directory,
since it needs 64 bit git now.
-- Joey Hess <id@joeyh.name> Thu, 01 Aug 2019 00:11:56 -0400 -- Joey Hess <id@joeyh.name> Thu, 01 Aug 2019 00:11:56 -0400