Merge pull request #1456 from Auto-unmount repos in pre-install

microsoft · Aug 20, 2019 · b19d2a5 · b19d2a5
2 parents e073946 + 6a4485d
commit b19d2a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/GVFS/GVFS.Installer.Mac/scripts/Distribution.xml b/GVFS/GVFS.Installer.Mac/scripts/Distribution.xml
@@ -34,7 +34,7 @@
 
         function GetBlockingProcesses()
         {
-            var watchList = [ "GVFS.Mount", "git", "gitk", "Wish" ];
+            var watchList = [ "git", "gitk", "Wish" ];
             var blockingProcesses = new Array();
             for (var process of watchList)
             {

diff --git a/GVFS/GVFS.Installer.Mac/scripts/preinstall b/GVFS/GVFS.Installer.Mac/scripts/preinstall
@@ -17,3 +17,10 @@ if [ "$isKextLoaded" -gt 0 ]; then
     echo $unloadCmd
     eval $unloadCmd || exit 1
 fi
+
+GVFSBINPATH="/usr/local/vfsforgit/gvfs"
+if [ -f "${GVFSBINPATH}" ]; then
+    unmountCmd="${GVFSBINPATH} service --unmount-all"
+    echo $unmountCmd
+    eval $unmountCmd || exit 1
+fi