git-extra: automatically mount /sdk32 and /sdk64 in the SDK

When 32-bit and 64-bit SDKs are installed next to each other, it is
convenient to be able to call

	git pull /sdk32$(pwd) master

to merge quickly the work that has been performed in the other SDK.

So let's make that easy.

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

Author: dscho

git-extra/PKGBUILD

@@ -30,7 +30,8 @@ source=('inputrc'
         'bash_profile.sh'
         'msys2-32.ico'
         '99-post-install-cleanup.post'
-        'astextplain')
+        'astextplain'
+        'git-sdk.sh')
 md5sums=('3fab57079f0322efe256e95fe29d516f'
          'e7ad03fffc29e619e402dbd5ec9ef74c'
          'bfb591886b2a28af3334521e71198b74'
@@ -47,7 +48,8 @@ md5sums=('3fab57079f0322efe256e95fe29d516f'
          'fc645b2d3dd6a7187db75a5ed9b88bae'
          'a8feb7ee2fa91bb179478f099444746f'
          'bdeb6046510aa1a6cd76e7f86673aa3f'
-         '6a1087428cd23aa7f6063d1a592cac38')
+         '6a1087428cd23aa7f6063d1a592cac38'
+         '593dbce30c442529b4351650f4422b6e')
 
 prepare() {
   test $startdir/$pkgname.install -nt $startdir/$pkgname.install.in &&
@@ -87,6 +89,7 @@ package() {
   install -m755 aliases.sh $pkgdir/etc/profile.d
   install -m755 env.sh $pkgdir/etc/profile.d
   install -m755 bash_profile.sh $pkgdir/etc/profile.d
+  install -m755 git-sdk.sh $pkgdir/etc/profile.d
   install -m644 msys2-32.ico $pkgdir/usr/share/git
   install -m644 99-post-install-cleanup.post $pkgdir/etc/post-install
   install -m755 astextplain $pkgdir/usr/bin

git-extra/git-sdk.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# This profile.d script configures a few things for the Git SDK (but is
+# excluded from the end user-facing Git for Windows).
+
+# If both 32-bit and 64-bit Git for Windows SDK is installed next to each other,
+# using the default directory names, mount them as /sdk32 and /sdk64,
+# respectively, to make it easier to interact between the two.
+
+rootdir="$(cygpath -w /)" &&
+case "$rootdir" in
+*\\git-sdk-32|*\\git-sdk-64)
+	otherarch=$((96-${rootdir##*-})) &&
+	if test ! -d /sdk$otherarch
+	then
+		othersdk="${rootdir%??}$otherarch"
+		test ! -d "$othersdk" ||
+		mount "$othersdk" /sdk$otherarch 2>/dev/null
+	fi
+	;;
+esac

make-file-list.sh

@@ -72,7 +72,8 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
 	-e '^/usr/share.*/magic$' \
 	-e '^/usr/share/perl5/core_perl/Unicode/Collate/Locale/' \
 	-e '^/usr/share/perl5/core_perl/pods/' \
-	-e '^/usr/share/vim/vim74/lang/' |
+	-e '^/usr/share/vim/vim74/lang/' \
+	-e '^/etc/profile.d/git-sdk.sh$' |
 if test -n "$WITH_L10N"
 then
 	cat