From 509c9b9baf68291db3270a913c835603ff669afb Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Tue, 8 Dec 2020 08:33:46 +0100 Subject: [PATCH 1/2] git update-git-for-windows: escape installer arguments When installer is being executed MSYS2 subsystem tries to convert unix paths to Windows paths. It seems it applies to installer arguments as well (because they start with slash). Thus `/SILENT` is converted to `C:/Program Files/Git/SILENT` (or something alike). This effectively bypasses installer arguments. The solution is to escape slashes in installer arguments. --- git-extra/git-update-git-for-windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-extra/git-update-git-for-windows b/git-extra/git-update-git-for-windows index 63009084ab..21ad281f9b 100755 --- a/git-extra/git-update-git-for-windows +++ b/git-extra/git-update-git-for-windows @@ -290,7 +290,7 @@ update_git_for_windows () { echo "Downloading $filename" >&2 fi curl -# -L -o $installer $download || return - start "" "$installer" /SILENT /VERYSILENT /NORESTART + start "" "$installer" //SILENT //VERYSILENT //NORESTART # Kill all Bash processes (which will let MinTTY quit, too)" # From 9d3660bcb68c8dcbbc0a5e7db556ac1442f83f2a Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 11 Dec 2020 11:47:51 +0100 Subject: [PATCH 2/2] git update-git-for-windows: make installation just silent again Currently the installer is started with `/VERYSILENT` switch which causes no indication of installation to be displayed. This may be confusing to the user because he doesn't know if the installer is still in the progress or if it finished already. Use of the switch was introduced in e119d03cf because of: > The command successfully identifies and downloads the update however when it > triggers the update it causes a license screen to display which requires > user interaction. Therefore the update can't be fully automated. Though it seems that running installer with just `/SILENT` doesn't require any user interaction. Only installation progress is displayed. --- git-extra/git-update-git-for-windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-extra/git-update-git-for-windows b/git-extra/git-update-git-for-windows index 21ad281f9b..7121dd7bec 100755 --- a/git-extra/git-update-git-for-windows +++ b/git-extra/git-update-git-for-windows @@ -290,7 +290,7 @@ update_git_for_windows () { echo "Downloading $filename" >&2 fi curl -# -L -o $installer $download || return - start "" "$installer" //SILENT //VERYSILENT //NORESTART + start "" "$installer" //SILENT //NORESTART # Kill all Bash processes (which will let MinTTY quit, too)" #