Add proper packaging for Linux #1

README.md

@@ -58,7 +58,7 @@ If you want to create installers, you additionally need:
 
 - Window: [WiX Toolset](https://wixtoolset.org/).
 - macOS: Xcode.
-- Linux: Distribution-specific tools for building rpm or deb packages, e.g., `fedora-packager` on Fedora.
+- Linux: Distribution-specific tools for building rpm or deb packages, e.g., `rpm-build` on Fedora. This script expects to create both `rpm` and `deb` on distributions derived from Debian, which should be possible if you install `rpm`.
 
 ## License
 

src/main/resources/com/octosign/whitelabel/build.properties

@@ -27,12 +27,11 @@ win.shortcut=
 
 ### Linux specific ###
 
-# Name for Linux package.
-# Defaults to the application name.
-linux.name=
 # Maintainer for .deb bundle (email address).
 linux.debMaintainer=
 # Menu group this application is placed in.
+# See https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry
+# Defaults to "Office".
 linux.menuGroup=
 # Required packages or capabilities for the application.
 linux.packageDeps=

src/main/scripts/package.sh

@@ -34,7 +34,6 @@ arguments=(
     "--license-file" "$appDirectory/LICENSE"
     "--resource-dir" "$resourcesDir"
     "--dest" "$output"
-    "--verbose"
 )
 
 if [[ "$platform" == "win" ]]; then
@@ -72,11 +71,54 @@ if [[ "$platform" == "win" ]]; then
         )
     fi
 
+    $jpackage "${arguments[@]}"
 fi
 
-# TODO: Use platform-specific Linux properties
+if [[ "$platform" == "linux" ]]; then
+    cp "$resourcesDir/Octosign.template.desktop" "$resourcesDir/Octosign.desktop"
+    sed -i -e "s/PROTOCOL_NAME/$properties_protocol/g" "$resourcesDir/Octosign.desktop"
 
-# TODO: Use platform-specific macOS properties
+    if [[ ! -z "$properties_linux_debMaintainer"  ]]; then
+        arguments+=(
+            "--linux-deb-maintainer" "$properties_linux_debMaintainer"
+        )
+    fi
+
+    if [[ ! -z "$properties_linux_appCategory"  ]]; then
+        arguments+=(
+            "--linux-app-category" "$properties_linux_appCategory"
+        )
+    fi
+
+    if [[ ! -z "$properties_linux_packageDeps"  ]]; then
+        arguments+=(
+            "--linux-package-deps" "$properties_linux_packageDeps"
+        )
+    fi
+
+    arguments+=(
+        "--linux-rpm-license-type" "${properties_linux_rpmLicenseType:-MIT}"
+        "--linux-menu-group" "${properties_linux_menuGroup:-Office}"
+    )
+
+    if [[ "$properties_linux_shortcut" == "1" ]]; then
+        arguments+=(
+            "--linux-shortcut"
+        )
+    fi
+
+    # Build both .rpm and .deb from Linux - should work from Debian-like distro but not the other way around
+    arguments+=(
+        "--type" "rpm"
+    )
+    $jpackage "${arguments[@]}"
 
-$jpackage "${arguments[@]}"
-# TODO: Use --resource-dir for resource overrides
+    if [[ -f "/etc/lsb-release" ]]; then
+        arguments+=(
+            "--type" "deb"
+        )
+        $jpackage "${arguments[@]}"
+    fi
+fi
+
+# TODO: Use platform-specific macOS properties

src/main/scripts/resources/.gitignore

@@ -1,2 +1,3 @@
-# Created dynamically during build from main.template.wxs
+# Created dynamically during build from *.template.*
 main.wxs
+Octosign.desktop

src/main/scripts/resources/Octosign.template.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=APPLICATION_NAME
+Comment=APPLICATION_DESCRIPTION
+Exec=APPLICATION_LAUNCHER --url='%u'
+Icon=APPLICATION_ICON
+Terminal=false
+Type=Application
+Categories=DEPLOY_BUNDLE_CATEGORY
+MimeType=x-scheme-handler/PROTOCOL_NAME;