From f7152f211de47c725c4fedc6bd5454bf1debfd9a Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 18 Feb 2024 10:46:53 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=85=20Handle=20version=20script=20erro?= =?UTF-8?q?rs=20when=20invoked=20by=20act?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit | fatal: Not a valid object name HEAD | MAS_VERSION: 0.0.0 --- script/version | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/script/version b/script/version index 19c7b31..42b17cf 100755 --- a/script/version +++ b/script/version @@ -9,8 +9,13 @@ # This no longer works with MARKETING_VERSION build setting in Info.plist # agvtool what-marketing-version -terse1 -MAS_VERSION=$(git describe --abbrev=0 --tags) +if git describe 2>/dev/null; then + MAS_VERSION=$(git describe --abbrev=0 --tags 2>/dev/null || true) +else + MAS_VERSION=0.0.0 +fi MAS_VERSION=${MAS_VERSION#v} +echo "MAS_VERSION: ${MAS_VERSION}" SCRIPT_PATH=$(dirname "$(which "$0")") @@ -20,5 +25,3 @@ enum Package { static let version = "${MAS_VERSION}" } EOF - -echo "${MAS_VERSION}"