Fix installing DEB package when lib64 is a symlink to lib (fixes #414)

filips123 · Nov 11, 2023 · 6bcfb24 · 6bcfb24
1 parent 29789db
commit 6bcfb24
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -111,9 +111,8 @@ assets = [
     ["target/release/firefoxpwa", "/usr/bin/firefoxpwa", "755"],
     ["target/release/firefoxpwa-connector", "/usr/libexec/firefoxpwa-connector", "755"],
 
-    # Manifests
+    # Manifest
     ["manifests/linux.json", "/usr/lib/mozilla/native-messaging-hosts/firefoxpwa.json", "644"],
-    ["manifests/linux.json", "/usr/lib64/mozilla/native-messaging-hosts/firefoxpwa.json", "644"],
 
     # Completions
     ["target/release/completions/firefoxpwa.bash", "/usr/share/bash-completion/completions/firefoxpwa", "644"],

diff --git a/native/packages/deb/postinst b/native/packages/deb/postinst
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e
 
+# Duplicate the manifest file over lib and lib64 directories
+# Needed because otherwise the manifest may not be detected on some platforms
+# Needed here because packaging it normally breaks when lib64 is a symlink to lib
+mkdir -p /usr/lib64/mozilla/native-messaging-hosts || true
+cp -f /usr/lib/mozilla/native-messaging-hosts/firefoxpwa.json /usr/lib64/mozilla/native-messaging-hosts/firefoxpwa.json || true
+
 # Make shell completions executable
 # We cannot do this in Cargo.toml because of cargo-deb bug
 # See: https://github.com/mmstick/cargo-deb/issues/67

diff --git a/native/packages/deb/postrm b/native/packages/deb/postrm
@@ -1,6 +1,13 @@
 #!/bin/sh
 set -e
 
+# Remove the duplicated manifest files
+if [ "$1" = "remove" ]
+then
+    rm /usr/lib/mozilla/native-messaging-hosts/firefoxpwa.json || true
+    rm /usr/lib64/mozilla/native-messaging-hosts/firefoxpwa.json || true
+fi
+
 # Add warning that runtime, profiles and web apps are still installed
 if [ "$1" = "remove" ]
 then