Merge pull request #200 from jnsgruk/tray-icon-config

feat: add snap config item for tray-icon; disable by default

snap/hooks/configure

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# On Fedora $SNAP is under /var and there is some magic to map it to /snap.
+# We need to handle that case and reset $SNAP
+SNAP="${SNAP//\/var\/lib\/snapd/}"
+
+tray_icon="$(snapctl get tray-icon)"
+if [[ -z "$tray_icon" ]]; then
+    snapctl set tray-icon=false
+fi

snap/local/usr/bin/signal-desktop-wrapper

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Run the configure hook which sets defaults for any config options
+"${SNAP}/snap/hooks/configure"
+
+# Grab the config options
+tray_icon="$(snapctl get tray-icon)"
+
+# Define an array of command line options
+opts=()
+
+# If the the tray icon is enabled, add to the list of command line args
+if [[ "${tray_icon}" == "true" ]]; then
+    opts+=("--use-tray-icon")
+fi
+
+# Run signal-desktop with the gathered arguments
+exec "${SNAP}/opt/Signal/signal-desktop" "--no-sandbox" "${opts[@]}" "$@"

snap/snapcraft.yaml

@@ -203,6 +203,11 @@ parts:
       - -opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib
       - -opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/include
 
+  local-parts:
+    plugin: dump
+    source: ./snap/local
+    source-type: local
+
   cleanup:
     after: [signal-desktop]
     plugin: nil
@@ -219,7 +224,7 @@ parts:
 apps:
   signal-desktop:
     extensions: [gnome]
-    command: opt/Signal/signal-desktop --use-tray-icon --no-sandbox
+    command: usr/bin/signal-desktop-wrapper
     plugs:
       - browser-support
       - camera