fix desktop file

-- correct icon path
-- correct execution path

4 files changed, 16 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20f56e71a7c9..d4deb6bae8e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,11 +25,9 @@ pkgbase = firefox-nightly-de
 	provides = firefox-nightly
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
-	source = firefox-nightly-safe.desktop
 	source = policies.json
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha512sums = df3c93f66b9ef30cf8b7301d288328503d796a0e79f994a1650dac900a8071719bb9d5e9c1135e1284c874732dc7c1e2032ecfb921799fb6b1ff50329f362308
-	sha512sums = 2f7e6aa935542e324eaa09f90a4f972716218c70299776a3476db7e7f2feee1a36c3cd35e51105b3d483436c02dedf5166656de6b58c7efed97d0480f8fc05fc
+	sha512sums = 7e950fbcdd7e0bd972038e3be158ba7ee5e0c0a3c9fc4778a7525e23ca7ab1dfff7ee7b14747651ca8666bd3000011c40074e53f1101e4d2bd3ca3721051cddf
 	sha512sums = 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 	source_i686 = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-70.0a1.de.linux-i686.tar.bz2
 	source_i686 = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-70.0a1.de.linux-i686.tar.bz2.asc
diff --git a/PKGBUILD b/PKGBUILD
index 3b92aa4f889d..af596c6b7115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,16 +5,15 @@ pkgname=firefox-nightly-de
 pkgdesc='Standalone Web Browser from Mozilla — Nightly build (de-DE)'
 url='https://www.mozilla.org/de-DE/firefox/nightly'
 pkgver=70.0a1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 
-source=('firefox-nightly.desktop' 'firefox-nightly-safe.desktop' 'policies.json')
+source=('firefox-nightly.desktop' 'policies.json')
 source_i686=("https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-${pkgver}.de.linux-i686.tar.bz2"{,.asc})
 source_x86_64=("https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-${pkgver}.de.linux-x86_64.tar.bz2"{,.asc})
 
-sha512sums=('df3c93f66b9ef30cf8b7301d288328503d796a0e79f994a1650dac900a8071719bb9d5e9c1135e1284c874732dc7c1e2032ecfb921799fb6b1ff50329f362308'
-  '2f7e6aa935542e324eaa09f90a4f972716218c70299776a3476db7e7f2feee1a36c3cd35e51105b3d483436c02dedf5166656de6b58c7efed97d0480f8fc05fc'
+sha512sums=('7e950fbcdd7e0bd972038e3be158ba7ee5e0c0a3c9fc4778a7525e23ca7ab1dfff7ee7b14747651ca8666bd3000011c40074e53f1101e4d2bd3ca3721051cddf'
   '5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308')
 sha512sums_i686=('SKIP' 'SKIP')
 sha512sums_x86_64=('SKIP' 'SKIP')
@@ -36,13 +35,13 @@ provides=('firefox-nightly')
 
 package() {
   install -d "${pkgdir}"/{usr/{bin,share/{applications,pixmaps}},opt}
-  cp -r firefox "${pkgdir}/opt/firefox-${pkgver}"
-  ln -s /opt/firefox-${pkgver}/firefox "${pkgdir}/usr/bin/firefox-nightly"
+  cp -r firefox "${pkgdir}/opt/firefox-nightly"
+  ln -s /opt/firefox-nightly/firefox "${pkgdir}/usr/bin/firefox-nightly"
 
-  install -m644 "${srcdir}"/{firefox-nightly.desktop,firefox-nightly-safe.desktop} "${pkgdir}/usr/share/applications/"
+  install -m644 "${srcdir}"/firefox-nightly.desktop "${pkgdir}/usr/share/applications/"
 
-  install -m644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/pixmaps/${pkgname}-icon.png"
+  install -m644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/pixmaps/firefox-nightly-icon.png"
 
   # Disabling auto updates
-  install -Dm644 "${srcdir}/policies.json" -t "${pkgdir}/opt/firefox-${pkgver}/distribution"
+  install -Dm644 "${srcdir}/policies.json" -t "${pkgdir}/opt/firefox-nightly/distribution"
 }
diff --git a/firefox-nightly-safe.desktop b/firefox-nightly-safe.desktop
deleted file mode 100644
index c74aa2673db6..000000000000
--- a/firefox-nightly-safe.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Firefox Nightly - Safe Mode (de)
-GenericName=Web Browser - Safe Mode
-Comment=Browse the World Wide Web - Safe Mode
-Exec=firefox-nightly -safe-mode %u
-Terminal=false
-Type=Application
-Icon=firefox-nightly-de-icon
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
-StartupNotify=false
diff --git a/firefox-nightly.desktop b/firefox-nightly.desktop
index 09ac671f25f3..9b5fbc72bc72 100644
--- a/firefox-nightly.desktop
+++ b/firefox-nightly.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Firefox Nightly (de)
+Name=Firefox Nightly
 GenericName=Web Browser
 GenericName[ar]=متصفح ويب
 GenericName[ast]=Restolador Web
@@ -81,13 +81,14 @@ Comment[uk]=Перегляд сторінок Інтернету
 Comment[vi]=Để duyệt các trang web
 Comment[zh_CN]=浏览互联网
 Comment[zh_TW]=瀏覽網際網路
-Exec=firefox-nightly %u
+Exec=/opt/firefox-nightly/firefox-bin %u
 Terminal=false
 Type=Application
-Icon=firefox-nightly-de-icon
+Icon=firefox-nightly-icon
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
 StartupNotify=true
+StartupWMClass=Nightly
 Actions=NewTab;NewWindow;NewPrivateWindow;
 
 [Desktop Action NewTab]
@@ -175,7 +176,7 @@ Name[vi]=Mở thẻ mới
 Name[xh]=Vula ithebhu entsha
 Name[zh_CN]=打开新标签页
 Name[zh_TW]=開啟新分頁
-Exec=firefox-nightly -new-tab about:newtab
+Exec=/opt/firefox-nightly/firefox-bin -new-tab about:newtab
 
 [Desktop Action NewWindow]
 Name=Open new window
@@ -262,7 +263,7 @@ Name[vi]=Mở cửa sổ mới
 Name[xh]=Vula iwindow entsha
 Name[zh_CN]=打开新窗口
 Name[zh_TW]=開啟新視窗
-Exec=firefox-nightly -new-window
+Exec=/opt/firefox-nightly/firefox -new-window
 
 [Desktop Action NewPrivateWindow]
 Name=New private window
@@ -349,4 +350,4 @@ Name[vi]=Cửa sổ riêng tư mới
 Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
-Exec=firefox-nightly -private-window
+Exec=/opt/firefox-nightly/firefox-bin -private-window