From 61d9022dd73a3f3d54928ede434633caff2e3161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Thu, 3 Oct 2024 07:28:09 +0200
Subject: [PATCH] Restore manual trimming of short sha (#22887)

This reverts "Let git handle short hashes automatically to avoid clashes"

This reverts commit 727ef731a3a02948791b751db8ddb29f4974af9b.
---
 scripts/setenv       | 2 +-
 scripts/upload-build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setenv b/scripts/setenv
index 77ea29fa6e..9ad51e1643 100755
--- a/scripts/setenv
+++ b/scripts/setenv
@@ -41,7 +41,7 @@ fi
 
 # Get the short SHA1
 export OPENRCT2_SHA1=$GITHUB_SHA
-export OPENRCT2_SHA1_SHORT=$(git rev-parse --short $GITHUB_SHA)
+export OPENRCT2_SHA1_SHORT=${OPENRCT2_SHA1::10}
 unset OPENRCT2_VERSION_EXTRA
 if [[ "$OPENRCT2_TAG" != "true" ]]; then
     export OPENRCT2_VERSION_EXTRA=$OPENRCT2_BRANCH-$OPENRCT2_SHA1_SHORT
diff --git a/scripts/upload-build b/scripts/upload-build
index e6b7c8ece8..5dbb4dc37c 100755
--- a/scripts/upload-build
+++ b/scripts/upload-build
@@ -24,7 +24,7 @@ sha1=$4
 branch=$5
 
 if [ -n "$branch" ]; then
-    versionextra=-$branch-$(git rev-parse --short $sha1)
+    versionextra=-$branch-${sha1::10}
 fi
 filename=OpenRCT2-$version$versionextra-$flavour