feat(git-update): get proxy from git http.proxy

Signed-off-by: Roger Meier <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>

Author: bufferoverflow

git-extra/PKGBUILD

@@ -60,7 +60,7 @@ sha256sums=('e6a17a669fe8282792b3d98a2c47718425364a0ca9a456bdbad4a69c57ec6978'
             '2dba0f5f8133b8e8d1da8291efec140cd516e385f04b33b95e4f97fc40f628b3'
             'f4e310c00721f8834949268167b0584b7c9323775a318574dbca960af10d7998'
             '89b4d784e1c07d67c11a35abc7094709c216372e2099b2eb7abbc6eb7c34861f'
-            '33a49036a52442a9754240e67abeb9dc2f686e8e25e5f70d522d78a150085e0a')
+            '2c366c999b7733b9f6d8588cb81b7b30246fa3239294df3d2faaa0c295fbb62d')
 
 prepare() {
   test $startdir/$pkgname.install -nt $startdir/$pkgname.install.in &&

git-extra/git-update

@@ -5,6 +5,13 @@
 # when confirmation to do so is given.
 
 git_update () {
+	proxy=$(git config --get http.proxy)
+	if test -n "$proxy"
+	then
+		export https_proxy="$proxy"
+		echo "Using proxy server $https_proxy detected from git http.proxy" >&2
+	fi
+
 	yn=
 	while test $# -gt 0
 	do
@@ -39,7 +46,7 @@ git_update () {
 		return
 	fi
 
-	echo "Update $latest is available"
+	echo "Update $latest is available" >&2
 	download=$(echo "$releases" |
 		grep '"browser_download_url": "' |
 		grep "$bit\-bit\.exe" |
@@ -55,7 +62,7 @@ git_update () {
 		else
 			warn=" (killing $other_bashes other Bash)"
 		fi
-		read -p "Download $filename and install$warn [N/y]? " yn
+		read -p "Download $filename and install$warn [N/y]? " yn >&2
 		case "$yn" in
 		[Yy]*) ;;
 		*) return 1;;

installer/install.iss

@@ -103,7 +103,7 @@ Name: consolefont; Description: Use a TrueType font in all console windows
 Filename: {app}\git-bash.exe; Parameters: --cd-to-home; Description: Launch Git Bash; Flags: nowait postinstall skipifsilent runasoriginaluser unchecked
 Filename: {app}\ReleaseNotes.html; Description: View Release Notes; Flags: shellexec skipifdoesntexist postinstall skipifsilent
 Filename: "schtasks"; \
-    Description: Daily check for available update; \
+    Description: Daily check for available update using git http.proxy if defined; \
     Parameters: "/Create /F /SC DAILY /TN ""Git for Windows Updater"" /TR ""'{app}\bin\git.exe' update"""; \
     Flags: runhidden postinstall