gnucash-on-windows master: msysgit has migrated to github
Geert Janssens
gjanssens at code.gnucash.org
Mon Jul 7 09:52:38 EDT 2014
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/92295754 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/71d5711a (commit)
commit 92295754a4ecc1f939a05763499b4f3fe756c098
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jul 7 12:54:41 2014 +0200
msysgit has migrated to github
Adjust scripts to fetch git from the new location.
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index efca557..00feb3f 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -67,22 +67,22 @@ End If
If WScript.Arguments.Named.Exists("GIT_PKG") Then
GIT_PKG = WScript.Arguments.Named.Item("GIT_PKG")
Else
- GIT_PKG = "Git-1.7.10-preview20120409.exe"
+ GIT_PKG = "Git-1.9.4-preview20140611"
End If
If WScript.Arguments.Named.Exists("strGitBaseUrl") Then
strGitBaseUrl = WScript.Arguments.Named.Item("strGitBaseUrl")
Else
- strGitBaseUrl = "http://msysgit.googlecode.com/files/"
+ strGitBaseUrl = "https://github.com/msysgit/msysgit/releases/download/"
End If
If WScript.Arguments.Named.Exists("GIT_URL") Then
GIT_URL = WScript.Arguments.Named.Item("GIT_URL")
Else
- GIT_URL = strGitBaseUrl & GIT_PKG
+ GIT_URL = strGitBaseUrl & GIT_PKG & "/" & GIT_PKG & ".exe"
End If
If WScript.Arguments.Named.Exists("GIT_DIR") Then
GIT_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GIT_DIR"), "\")
Else
- GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
+ GIT_DIR = GLOBAL_DIR & "\git-1.9.4"
End If
If WScript.Arguments.Named.Exists("GC_WIN_REPOS_URL") Then
GC_WIN_REPOS_URL = WScript.Arguments.Named.Item("GC_WIN_REPOS_URL")
@@ -218,10 +218,10 @@ If objFso.FileExists(strGit) Then
Else
stdout.WriteLine "Not found, will be installed"
- strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG
+ strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG & ".exe"
If Not objFso.FileExists(strGitPkg) Then
stdout.Write "Downloading git installer... "
- objWsh.Run strWget & " -P" & DOWNLOAD_DIR & " " & GIT_URL, 1, true
+ objWsh.Run strWget & " -O" & strGitPkg & " --no-check-certificate " & GIT_URL, 1, true
If Not objFso.FileExists(strGitPkg) Then
stdout.WriteLine "Failed"
diff --git a/defaults.sh b/defaults.sh
index 1b8527d..0c42df5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -327,8 +327,8 @@ set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
-set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.10-preview20120409.exe"
-set_default GIT_DIR $GLOBAL_DIR\\git-1.7.10
+set_default GIT_URL "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe"
+set_default GIT_DIR $GLOBAL_DIR\\git-1.9.4
# OFX import in gnucash and ofx directconnect support for aqbanking
set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
diff --git a/functions.sh b/functions.sh
index 83800a6..96c450a 100644
--- a/functions.sh
+++ b/functions.sh
@@ -61,9 +61,9 @@ function smart_wget() {
if [ ! -f $_DLD/$_UFILE ] ; then
# If WGET_RATE is set (in bytes/sec), limit download bandwith
if [ ! -z "$WGET_RATE" ] ; then
- wget --passive-ftp -c $1 -P $TMP_UDIR --limit-rate=$WGET_RATE
+ wget --passive-ftp -c $1 -P $TMP_UDIR --limit-rate=$WGET_RATE $WGET_EXTRA_OPTIONS
else
- wget --passive-ftp -c $1 -P $TMP_UDIR
+ wget --passive-ftp -c $1 -P $TMP_UDIR $WGET_EXTRA_OPTIONS
fi
mv $TMP_UDIR/$_FILE $_DLD/$_UFILE
fi
diff --git a/install-impl.sh b/install-impl.sh
index 30a65af..1707ef5 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -247,9 +247,11 @@ function inst_git() {
echo "git already installed in $_GIT_UDIR. skipping."
set_env "$_GIT_UDIR/bin/git" GIT_CMD
else
- smart_wget $GIT_URL $DOWNLOAD_DIR
+ WGET_EXTRA_OPTIONS="--no-check-certificate -O$TMP_DIR\\$(basename $GIT_URL)" # github certificate can't be verified on WinXP
+ smart_wget $GIT_URL $DOWNLOAD_DIR $(basename $GIT_URL)
$LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
set_env "$_GIT_UDIR/bin/git" GIT_CMD
+ unset WGET_EXTRA_OPTIONS
quiet "$GIT_CMD" --help || die "git unavailable"
fi
# Make sure GIT_CMD is available to subshells if it is set
Summary of changes:
bootstrap_win_dev.vbs | 12 ++++++------
defaults.sh | 4 ++--
functions.sh | 4 ++--
install-impl.sh | 4 +++-
4 files changed, 13 insertions(+), 11 deletions(-)
More information about the gnucash-changes
mailing list