Fixes an error with the desktop file.

4 files changed, 25 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20d32394e7bf..65e4178f9986 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = github-desktop
 	pkgdesc = GUI for managing Git and GitHub.
 	pkgver = 1.0.4_beta0
-	pkgrel = 2
+	pkgrel = 4
 	url = https://desktop.github.com
 	install = github-desktop.install
 	arch = x86_64
@@ -15,7 +15,9 @@ pkgbase = github-desktop
 	depends = libcurl-gnutls
 	optdepends = hub: CLI interface for GitHub.
 	source = https://github.com/gengjiawen/desktop/releases/download/v1.0.4-beta0/desktop_1.0.4-beta0_amd64.deb
+	source = desktop.desktop
 	md5sums = e5285a06a6ab201f36b49f877f87abbc
+	md5sums = b94003a96fb27b8c6da6bf5f68469f9f
 
 pkgname = github-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 7ec866977485..1d98af093108 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=github-desktop
 pkgver=1.0.4_beta0
-pkgrel=2
+pkgrel=4
 pkgdesc="GUI for managing Git and GitHub."
 arch=('x86_64')
 url="https://desktop.github.com"
@@ -12,8 +12,14 @@ install=github-desktop.install
 depends=('gnome-keyring' 'git' 'electron' 'nodejs' 'libcurl-compat' 'libcurl-gnutls')
     optdepends=('hub: CLI interface for GitHub.')
 makedepends=('libcurl-openssl-1.0')
-source=(https://github.com/gengjiawen/desktop/releases/download/v${pkgver//_/-}/desktop_${pkgver//_/-}_amd64.deb)
-md5sums=('e5285a06a6ab201f36b49f877f87abbc')
+source=(
+    https://github.com/gengjiawen/desktop/releases/download/v${pkgver//_/-}/desktop_${pkgver//_/-}_amd64.deb
+    desktop.desktop
+)
+md5sums=(
+e5285a06a6ab201f36b49f877f87abbc
+b94003a96fb27b8c6da6bf5f68469f9f
+)
 
 prepare()   {
     bsdtar -xJf data.tar.xz
@@ -23,5 +29,6 @@ package()   {
     cp --preserve=mode -r {opt,usr} "${pkgdir}"
 
     find "${pkgdir}" -type d -exec chmod 755 {} +
+    cp --preserve=mode ${srcdir}/desktop.desktop ${pkgdir}/usr/share/applications
 }
 
diff --git a/desktop.desktop b/desktop.desktop
new file mode 100644
index 000000000000..651687bdbe42
--- /dev/null
+++ b/desktop.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=GitHub Desktop
+Comment=Extend your GitHub workflow beyond your browser with GitHub Desktop
+Comment[es]=Trabaja con GitHub desde tu escritorio.
+Comment[eu]=GitHub-ekin lan egin zure ordenagailutik.
+Exec=/usr/bin/github-desktop %U
+Terminal=false
+Type=Application
+Icon=github
diff --git a/github-desktop.install b/github-desktop.install
index c025bf2627a0..e91f9fef653c 100644
--- a/github-desktop.install
+++ b/github-desktop.install
@@ -9,16 +9,6 @@ pre_install() {
 post_install()  {
     echo "LD_PRELOAD=libcurl.so.3 /opt/GithubDesktop/desktop "$@"" > /usr/bin/github-desktop
     chmod 755 /usr/bin/github-desktop
-    echo "[Desktop Entry]" > /usr/share/applications/desktop.desktop
-    echo "Name=GitHub Desktop" >> /usr/share/applications/desktop.desktop
-    echo "Comment=Extend your GitHub workflow beyond your browser with GitHub Desktop" >> /usr/share/applications/desktop.desktop
-    echo "Comment[es]=Trabaja con GitHub desde tu escritorio." >> /usr/share/applications/desktop.desktop
-    echo "Comment[eu]=GitHub-ekin lan egin zure ordenagailutik." >> /usr/share/applications/desktop.desktop
-    echo "Exec=/usr/bin/github-desktop %U" >> /usr/share/applications/desktop.desktop
-    echo "Terminal=false" >> /usr/share/applications/desktop.desktop
-    echo "Type=Application" >> /usr/share/applications/desktop.desktop
-    echo "Categories=Development;" >> /usr/share/applications/desktop.desktop
-    echo "Icon=github" >> /usr/share/applications/desktop.desktop
 }
 
 post_remove()   {
@@ -32,25 +22,8 @@ post_remove()   {
 }
 
 pre_upgrade()   {
-    rm -rf /opt/GithubDesktop
-    rm -rf /usr/share/applications/desktop.desktop
-    rm -rf /usr/share/doc/desktop
-    rm -rf /usr/share/icons/hicolor/512x512/apps/desktop.png
-    rm -rf /usr/share/icons/hicolor/256x256/apps/desktop.png
-    rm -rf /usr/share/icons/hicolor/1024x1024/apps/desktop.png
-    rm -rf /usr/bin/github-desktop
+    post_remove
 }
-post_upgrade()  {
-    echo "LD_PRELOAD=libcurl.so.3 /opt/GithubDesktop/desktop "$@"" > /usr/bin/github-desktop
-    chmod 755 /usr/bin/github-desktop
-    echo "[Desktop Entry]" > /usr/share/applications/desktop.desktop
-    echo "Name=GitHub Desktop" >> /usr/share/applications/desktop.desktop
-    echo "Comment=Extend your GitHub workflow beyond your browser with GitHub Desktop" >> /usr/share/applications/desktop.desktop
-    echo "Comment[es]=Trabaja con GitHub desde tu escritorio." >> /usr/share/applications/desktop.desktop
-    echo "Comment[eu]=GitHub-ekin lan egin zure ordenagailutik." >> /usr/share/applications/desktop.desktop
-    echo "Exec=/usr/bin/github-desktop %U" >> /usr/share/applications/desktop.desktop
-    echo "Terminal=false" >> /usr/share/applications/desktop.desktop
-    echo "Type=Application" >> /usr/share/applications/desktop.desktop
-    echo "Categories=Development;" >> /usr/share/desktop.desktop
-    echo "Icon=github" >> /usr/share/applications/desktop.desktop
+post_upgrade() {
+    post_install
 }