From 02691078305f58ef46d1665e410f03a9a1d5dd37 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Wed, 4 Dec 2019 12:49:07 -0700
Subject: [PATCH] Add detailed version/build number to appimage and debian
 package filenames

---
 packaging/scripts/appimage_build.sh | 4 ++--
 packaging/scripts/debian_build.sh   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/scripts/appimage_build.sh b/packaging/scripts/appimage_build.sh
index eb10d0d..7d7f7f4 100644
--- a/packaging/scripts/appimage_build.sh
+++ b/packaging/scripts/appimage_build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $1 is the binary location, $2 is the arch
+# $1 is the binary location, $2 is the arch, $3 is the version
 mkdir out
 mkdir -p appimage/NotePost.AppDir/usr/lib/notepost
 rm -rf appimage/NotePost.AppDir/usr/lib/notepost
@@ -8,4 +8,4 @@ rsync -rv "$1" appimage/NotePost.AppDir/usr/lib/notepost
 chmod +x appimage/NotePost.AppDir/AppRun
 wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O appimagetool
 chmod +x appimagetool
-./appimagetool appimage/NotePost.AppDir "out/NotePost_$2.AppImage"
+./appimagetool appimage/NotePost.AppDir "out/NotePost_$2_$3.AppImage"
diff --git a/packaging/scripts/debian_build.sh b/packaging/scripts/debian_build.sh
index c5083ef..9bd0f9c 100644
--- a/packaging/scripts/debian_build.sh
+++ b/packaging/scripts/debian_build.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
-# $1 is the app source location, $2 is the svg icon, $3 is the app version code
+# $1 is the app source location, $2 is the svg icon, $3 is the app version code, $4 is the build number
 mkdir -p out
 rm -rf debian/usr/share/notepost
 mkdir -p debian/usr/share/notepost
 mkdir -p debian/usr/share/doc/notepost
 rsync -rv "$1" debian/usr/share/notepost
 cp debian/DEBIAN/copyright debian/usr/share/doc/notepost/
-sed -i "s/Version:\s[0-9.\-]\+/Version: $3+b$BUILD_NUMBER/" debian/DEBIAN/control
+sed -i "s/Version:\s[0-9.\-]\+/Version: $3+b$4/" debian/DEBIAN/control
 cp "$2" debian/usr/share/notepost/logo.svg
-dpkg-deb -b debian "out/notepost_$3+b${BUILD_NUMBER}_all.deb"
+dpkg-deb -b debian "out/notepost_$3+b${4}_all.deb"