Merge pull request #481 from dscho/really-only-add-aarch64-repository-for-arm64

Really only add the aarch64 Pacman repository for git-sdk-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.628.f599c8ce7
+pkgver=1.1.630.257a670d3
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')

git-extra/git-extra.install

@@ -120,8 +120,8 @@ GITATTRIBUTES
 	grep -q "$otherpacman" etc/pacman.conf ||
 	sed -i -e '/^\[mingw32\]/i['$otherpacman']\nServer = https://wingit.blob.core.windows.net/'$otherarch'\n' etc/pacman.conf
 
-	test ! -d /clangarm64 ||
-	grep -q "git-for-windows-aarch64" etc/pacman.conf ||
+	test -z "$(find /clangarm64 -type f -print -quit) || # if /clangarm64 exists and contains at least one file
+	grep -q "git-for-windows-aarch64" etc/pacman.conf || # then add Git for Windows' aarch64 repository (unless it's already added)
 	sed -i -e '/^\[clangarm64]/i[git-for-windows-aarch64]\nServer = https://wingit.blob.core.windows.net/aarch64\n' etc/pacman.conf
 
 	! grep -q 'https://dl.bintray.com/\$repo/pacman/\$arch' etc/pacman.conf ||

git-extra/git-extra.install.in

@@ -86,8 +86,8 @@ GITATTRIBUTES
 	grep -q "$otherpacman" etc/pacman.conf ||
 	sed -i -e '/^\[mingw32\]/i['$otherpacman']\nServer = https://wingit.blob.core.windows.net/'$otherarch'\n' etc/pacman.conf
 
-	test ! -d /clangarm64 ||
-	grep -q "git-for-windows-aarch64" etc/pacman.conf ||
+	test -z "$(find /clangarm64 -type f -print -quit) || # if /clangarm64 exists and contains at least one file
+	grep -q "git-for-windows-aarch64" etc/pacman.conf || # then add Git for Windows' aarch64 repository (unless it's already added)
 	sed -i -e '/^\[clangarm64]/i[git-for-windows-aarch64]\nServer = https://wingit.blob.core.windows.net/aarch64\n' etc/pacman.conf
 
 	! grep -q 'https://dl.bintray.com/\$repo/pacman/\$arch' etc/pacman.conf ||