Mac Installer: unmount all repos

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
microsoft · Aug 20, 2019 · 7a11773 · 7a11773
1 parent ecd7f9a
commit 7a11773
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/Scalar.Installer.Mac/scripts/Distribution.xml b/Scalar.Installer.Mac/scripts/Distribution.xml
@@ -19,7 +19,7 @@
     GIT_PKG_REF_PLACEHOLDER
     <installation-check script="InstallationCheck()"/>
     <script>
-        function InstallationCheck(prefix) 
+        function InstallationCheck(prefix)
         {
             var blockingProcesses = GetBlockingProcesses();
             if (blockingProcesses.length > 0)
@@ -28,24 +28,24 @@
                 my.result.type = 'Fatal';
                 return false;
             }
-            
+
             return true;
         }
-        
+
         function GetBlockingProcesses()
         {
-            var watchList = [ "Scalar.Mount", "git", "gitk", "Wish" ];
+            var watchList = [ "git", "gitk", "Wish" ];
             var blockingProcesses = new Array();
             for (var process of watchList)
             {
                 var isRunningCmd = "ps -Ac -o command | grep -w '" + process + "'";
                 var status = system.run("/bin/bash", "-c", isRunningCmd);
-                if (status == 0) 
+                if (status == 0)
                 {
                     blockingProcesses.push(process);
                 }
             }
-            
+
             return blockingProcesses;
         }
     </script>

diff --git a/Scalar.Installer.Mac/scripts/preinstall b/Scalar.Installer.Mac/scripts/preinstall
@@ -1 +1,8 @@
 #!/bin/bash
+
+SCALARBINPATH="/usr/local/scalar/scalar"
+if [ -f "${SCALARBINPATH}" ]; then
+    unmountCmd="${SCALARBINPATH} service --unmount-all"
+    echo $unmountCmd
+    eval $unmountCmd || exit 1
+fi