SF-1059 Change default path for hg executable to /usr/bin/hg (#3593)

Author: marksvc

.github/workflows/e2e-tests.yml

@@ -479,8 +479,6 @@ jobs:
           npx playwright install
 
       - name: Run E2E tests
-        env:
-          HG_PATH: /usr/bin/hg
         run: ./src/SIL.XForge.Scripture/ClientApp/e2e/pre_merge_ci.sh
 
       - name: Publish test results

deploy/vagrant/sfdev/base/provision.sh

@@ -599,9 +599,6 @@ cd ~/code/web-xforge && dotnet clean
 # Undo temporary changes and/or clean up
 cd ~/code/web-xforge && git checkout -- .config/dotnet-tools.json
 
-# Use system hg.
-tee --append ~/.pam_environment >/dev/null <<<'HG_PATH=/usr/bin/hg'
-
 # Docker
 
 # https://docs.docker.com/desktop/install/linux-install/

src/SIL.XForge.Scripture/Dockerfile

@@ -24,8 +24,7 @@ RUN apt-get install -y \
     nodejs \
     && rm -rf /var/lib/apt/lists/*
 # Setup Scripture Forge Paths
-RUN ln -s /usr/bin/hg /usr/local/bin/hg \
-    && mkdir -p /var/lib/scriptureforge/sync \
+RUN mkdir -p /var/lib/scriptureforge/sync \
     && mkdir -p /var/lib/scriptureforge/audio \
     && mkdir -p /var/lib/scriptureforge/training-data \
     && mkdir -p /var/lib/xforge/avatars \

src/SIL.XForge.Scripture/appsettings.Development.json

@@ -38,7 +38,7 @@
     "SecurePort": 5005
   },
   "Paratext": {
-    "HgExe": "/usr/local/bin/hg"
+    "HgExe": "/usr/bin/hg"
   },
   "Serval": {
     "ApiServer": "https://qa.serval-api.org",

src/SIL.XForge.Scripture/appsettings.Testing.json

@@ -26,7 +26,7 @@
     "BackendClientId": "D7bF2gHmMVAaC67a1GF6f0DdQdRpqQwA"
   },
   "Paratext": {
-    "HgExe": "/usr/local/bin/hg"
+    "HgExe": "/usr/bin/hg"
   },
   "Serval": {
     "ApiServer": "https://qa.serval-api.org",

tools/CommitGenerator/Program.cs

@@ -41,7 +41,7 @@
 string secondVersion = await File.ReadAllTextAsync(secondVersionFileName);
 
 // Set up Mercurial
-string customHgPath = Environment.GetEnvironmentVariable("HG_PATH") ?? "/usr/local/bin/hg";
+string customHgPath = Environment.GetEnvironmentVariable("HG_PATH") ?? "/usr/bin/hg";
 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
     customHgPath = Path.GetExtension(customHgPath.ToLowerInvariant()) != ".exe" ? customHgPath + ".exe" : customHgPath;

tools/RepoInfo/Program.cs

@@ -61,7 +61,7 @@
 }
 
 // Set up Mercurial
-string customHgPath = Environment.GetEnvironmentVariable("HG_PATH") ?? "/usr/local/bin/hg";
+string customHgPath = Environment.GetEnvironmentVariable("HG_PATH") ?? "/usr/bin/hg";
 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
     customHgPath = Path.GetExtension(customHgPath.ToLowerInvariant()) != ".exe" ? customHgPath + ".exe" : customHgPath;