Merge pull request #5455 from LyzardKing/master

Fix postrm in deb
JabRef · Oct 17, 2019 · 26a1d29 · 26a1d29
2 parents 442618b + 1f8f628
commit 26a1d29
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -592,7 +592,6 @@ jlink {
                     '--linux-menu-group', 'Office;',
                     '--linux-rpm-license-type', 'MIT',
                     // '--license-file', "${projectDir}/LICENSE.md",
-                    '--file-associations', "${projectDir}/buildres/linux/desktop.properties",
                     '--description', 'JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.',
                     '--linux-shortcut'
             ]

diff --git a/buildres/linux/copyright b/buildres/linux/copyright
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: APPLICATION_COPYRIGHT
-License: APPLICATION_LICENSE_TEXT
+Copyright: Copyright (C) 2003-2019 JabRef Authors
+License: MIT
diff --git a/buildres/linux/desktop.properties b/buildres/linux/desktop.properties
diff --git a/buildres/linux/jabref-JabRef.desktop b/buildres/linux/jabref-JabRef.desktop
@@ -6,6 +6,7 @@ Exec=APPLICATION_LAUNCHER
 Icon=APPLICATION_ICON
 Terminal=false
 Type=Application
+MimeType=text/x-bibtex;
 Categories=DEPLOY_BUNDLE_CATEGORY
 Keywords=bibtex;biblatex;latex;bibliography
 StartupWMClass=org-jabref-JabRefMain
diff --git a/buildres/linux/prerm → buildres/linux/postrm b/buildres/linux/prerm → buildres/linux/postrm
@@ -18,9 +18,10 @@ set -e
 # the debian-policy package
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    INSTALL_PATH="/usr/lib/mozilla/native-messaging-hosts/"
-    if grep --quiet '"path": "/opt' /usr/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json; then
-        rm -D -m0755 /opt/jabref/lib/org.jabref.jabref.json $INSTALL_PATH
+    INSTALL_PATH="/usr/lib/mozilla/native-messaging-hosts"
+    if grep --quiet '"path": "/opt' $INSTALL_PATH/org.jabref.jabref.json; then
+        rm $INSTALL_PATH/org.jabref.jabref.json
+    fi
     ;;
 
     *)