diff --git a/Makefile b/Makefile index 814a36519..958006a39 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ ifdef NIGHTLY deb_iteration := 0 tar_version := nightly else ifeq ($(tag),) - version := $(next_version)~$(commit) + version := $(next_version) rpm_version := $(version)~$(commit)-0 rpm_iteration := 0 deb_version := $(version)~$(commit)-0 @@ -106,7 +106,7 @@ deps: .PHONY: version version: - @echo $(version) + @echo $(version)-$(commit) .PHONY: versioninfo versioninfo: diff --git a/scripts/mac-signing.sh b/scripts/mac-signing.sh index 6c01d4a0a..7e936f97e 100644 --- a/scripts/mac-signing.sh +++ b/scripts/mac-signing.sh @@ -21,10 +21,6 @@ amdFile=$(find "$HOME/project/dist" -name "*darwin_amd64.tar*") armFile=$(find "$HOME/project/dist" -name "*darwin_arm64.tar*") macFiles=("${amdFile}" "${armFile}") -version=$(make version) -plutil -insert CFBundleShortVersionString -string "$version" ~/project/info.plist -plutil -insert CFBundleVersion -string "$version" ~/project/info.plist - for tarFile in "${macFiles[@]}"; do cleanup