From 644cce2b9f26534fdedb95524de0b02aa22fd688 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 18 Apr 2025 18:45:56 +1000 Subject: [PATCH] Revert "Fix auto-updates of RobustToolbox on Windows" (#36671) Revert "Fix auto-updates of RobustToolbox on Windows (#33323)" This reverts commit b1c1cb96b5c91c0134660d735ea554fef536dc70. --- BuildChecker/BuildChecker.csproj | 1 + BuildChecker/git_helper.py | 2 +- BuildChecker/hooks/post-checkout | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj index c0a0c9e1f3..4bd7fcf78c 100644 --- a/BuildChecker/BuildChecker.csproj +++ b/BuildChecker/BuildChecker.csproj @@ -15,6 +15,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild python3 + py -3 {C899FCA4-7037-4E49-ABC2-44DE72487110} net4.7.2 false diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py index 83c41c3403..becd4506e8 100644 --- a/BuildChecker/git_helper.py +++ b/BuildChecker/git_helper.py @@ -10,7 +10,7 @@ from typing import List SOLUTION_PATH = Path("..") / "SpaceStation14.sln" # If this doesn't match the saved version we overwrite them all. -CURRENT_HOOKS_VERSION = "3" +CURRENT_HOOKS_VERSION = "2" QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet" diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout index f34ffd293d..c5662445c2 100755 --- a/BuildChecker/hooks/post-checkout +++ b/BuildChecker/hooks/post-checkout @@ -4,4 +4,10 @@ gitroot=`git rev-parse --show-toplevel` cd "$gitroot/BuildChecker" -python3 git_helper.py --quiet +if [[ `uname` == MINGW* || `uname` == CYGWIN* ]]; then + # Windows + py -3 git_helper.py --quiet +else + # Not Windows, so probably some other Unix thing. + python3 git_helper.py --quiet +fi