Merge pull request #644 from rimrul/update-gfw-improvements

git-update-git-for-windows: show toast icon on ARM64

Author: dscho

git-extra/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.670.09847e01e
+pkgver=1.1.672.64870a8db
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -84,7 +84,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             '32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea'
             '7436438b8db90ce4b79402a5383a688fa95831167b38f9f918f438ade199a44d'
             '22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
-            '38c0cf57e03d275cdd42984f102bee8352fac672f875ab23c46b9625eefc49f3'
+            '8120b41b869693e07acc4707a0ab45505e7c5e4156a3a44b19152f1f425df85f'
             '15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'
             'ebd1d20aa94be11c6b9bec7d33614d32016343d282c4716d0561ab41407c99bf'
             '97e89689d91747ddb5ee873ae864aebcbb8d0364a52fa198db1e439ee2965b9b'

git-extra/git-update-git-for-windows

@@ -249,8 +249,10 @@ update_git_for_windows () {
 	if test -d /clangarm64/bin
 	then
 		arch_bit=arm64
+		prefix=/clangarm64
 	else
 		arch_bit=${bit}-bit
+		prefix=/mingw$bit
 	fi
 
 	echo "$git_label $version ($arch_bit)" >&2
@@ -296,7 +298,7 @@ update_git_for_windows () {
 		then
 			wintoast.exe --appname "$git_label" \
 				--appid GitForWindows.Updater \
-				--image /mingw$bit/share/git/git-for-windows.ico \
+				--image $prefix/share/git/git-for-windows.ico \
 				--text "Download and install $name$warn?" \
 				--action Yes --action No --expirems 15000
 			case $? in