From d072b5064b6384aff4ab0511687507dbfc9a206c Mon Sep 17 00:00:00 2001
From: Kyle Bloom <kyle@symless.com>
Date: Wed, 10 Feb 2021 19:01:44 +0000
Subject: [PATCH] Add stage to file name (#6946)

* Add stage to file name

* ChangeLog

* Update issue number

* Fix debian control file for enterprise

* Fix enterprise check
---
 .github/workflows/job-build-raspberry-pi.yaml | 13 ++++++-------
 ChangeLog                                     |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/job-build-raspberry-pi.yaml b/.github/workflows/job-build-raspberry-pi.yaml
index c077f828e..a8147c50f 100644
--- a/.github/workflows/job-build-raspberry-pi.yaml
+++ b/.github/workflows/job-build-raspberry-pi.yaml
@@ -23,12 +23,11 @@ jobs:
       id: version
       run: |
         python3 CI/build_version.py
-        mkdir -p version-info; cd version-info
-        cmake ..
-        cd ..
+        mkdir -p version-info && cd version-info && cmake .. && cd ..
         . ./version-info/version
+        rm -rf version-info
         SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH"
-        SYNERGY_REVISION=`git rev-parse --short=8 HEAD`
+        SYNERGY_REVISION=$(git rev-parse --short=8 HEAD)
         SYNERGY_DEB_VERSION="${SYNERGY_VERSION}.${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}"
         echo "::set-output name=SYNERGY_VERSION_MAJOR::${SYNERGY_VERSION_MAJOR}"
         echo "::set-output name=SYNERGY_VERSION_MINOR::${SYNERGY_VERSION_MINOR}"
@@ -38,7 +37,7 @@ jobs:
         echo "::set-output name=SYNERGY_VERSION::${SYNERGY_VERSION}"
         echo "::set-output name=SYNERGY_REVISION::${SYNERGY_REVISION}"
         echo "::set-output name=SYNERGY_DEB_VERSION::${SYNERGY_DEB_VERSION}"
-        if [$SYNERGY_ENTERPRISE == '1']
+        if [ "$SYNERGY_ENTERPRISE" == '1' ]
         then
             echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}"
             echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy-enterprise"
@@ -46,7 +45,6 @@ jobs:
             echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}"
             echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy"
         fi
-        rm -rf version-info
 
     - name: Build deb
       env:
@@ -54,9 +52,10 @@ jobs:
         SYNERGY_REVISION: ${{ steps.version.outputs.SYNERGY_REVISION }}
         SYNERGY_DEB_VERSION: ${{ steps.version.outputs.SYNERGY_DEB_VERSION }}
         PACKAGE_NAME: ${{ steps.version.outputs.SYNERGY_PACKAGE_NAME }}
+        SYNERGY_VERSION_STAGE: ${{ steps.version.outputs.SYNERGY_VERSION_STAGE }}
       run: |
+        sed -i "s/ synergy/ ${PACKAGE_NAME}/g" ./debian/control
         dch --create --package "${PACKAGE_NAME}" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release"
-        export GPG_TTY=$(tty)
         debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
         mkdir -p package
         cd ..
diff --git a/ChangeLog b/ChangeLog
index 265acc48a..3497ee7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ Bug fixes:
 - #6944 Systray icon is incorrect for macOS Big Sur
 - #6941 The application doesn't recognize old settings
 - #6945 Fix build for Raspberry Pi
+- #6946 Add build stage to filename
 
 Enhancements:
 - #6912 Removes UI for Screen Saver Sync and Files Drag and Drop