Made to use AppImage file; bumped to v0.2.95

4 files changed, 31 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7683bb071a6b..0e8b0ea68354 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = ripcord
-	pkgdesc = An alternative Discord client
-	pkgver = 0.2.90
-	pkgrel = 2
+	pkgdesc = Qt-based Discord and Slack client
+	pkgver = 0.2.95
+	pkgrel = 1
 	url = https://cancel.fm/ripcord/
 	arch = x86_64
 	license = custom
-	source = https://cancel.fm/dl/Ripcord-0.2.90-x86_64.AppImage
-	source = ripcord.desktop
-	sha256sums = edb4f60d52a8c9cee1e5951bf0317fad155dfa1bff01052ad75fc9e3882061b4
-	sha256sums = 1774644c7f61859cbca2d2e25e71e0afcf03321f95d82dd7249f65e37c3926a6
+	options = !strip
+	source = https://cancel.fm/dl/Ripcord--x86_64.AppImage
+	validpgpkeys = ABBAD1CB484F53024CF5868B69332F9203F21F5C
+	sha256sums = INVALID
 
 pkgname = ripcord
 
diff --git a/PKGBUILD b/PKGBUILD
index ee53d5dd680f..7d658d0a89c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,41 @@
+# Maintainer: Aanok (aanok.aur@gmail.com)
+# Contributor: therealfarfetchd
 pkgname='ripcord'
-pkgver='0.2.90'
-pkgrel=2
-pkgdesc='An alternative Discord client'
+pkgver=0.2.95
+pkgrel=1
+pkgdesc='Qt-based Discord and Slack client'
 arch=('x86_64')
 url='https://cancel.fm/ripcord/'
 license=('custom')
+validpgpkeys=('ABBAD1CB484F53024CF5868B69332F9203F21F5C')
 
-_file="Ripcord-$pkgver-x86_64.AppImage"
+_file="Ripcord-${_pkgver}-${CARCH}.AppImage"
+source=("https://cancel.fm/dl/$_file")
+sha256sums=('INVALID')
 
-source=(
-  "https://cancel.fm/dl/$_file"
-  'ripcord.desktop'
-)
+# !! AppImage is emptied if symbols are stripped away !!
+options=('!strip')
 
-sha256sums=(
-  'edb4f60d52a8c9cee1e5951bf0317fad155dfa1bff01052ad75fc9e3882061b4'
-  '1774644c7f61859cbca2d2e25e71e0afcf03321f95d82dd7249f65e37c3926a6'
-)
+PKGEXT='.pkg.tar'
 
 prepare() {
+  # we extract so we can install the icon and .desktop files
   chmod +x "$_file"
-  "./$_file" --appimage-extract
+  "./$_file" --appimage-extract &>/dev/null
 }
 
 package() {
-  cd squashfs-root
-
   install -d "$pkgdir"/usr/bin/
-  install -d "$pkgdir"/usr/lib/ripcord/
+  install -d "$pkgdir"/opt/ripcord/
   install -d "$pkgdir"/usr/share/applications/
   install -d "$pkgdir"/usr/share/icons/
-
-  install -m644 -T Ripcord_Icon.png "$pkgdir"/usr/share/icons/ripcord.png
-  install -m644    "$srcdir"/ripcord.desktop "$pkgdir"/usr/share/applications
-
-  ln -s /usr/lib/ripcord/Ripcord "$pkgdir"/usr/bin/ripcord
-
-  rm    additional_license_information.txt
-  rm    AppRun
-  rm -r doc
-  rm    Ripcord.desktop
-  rm    Ripcord_Icon.png
-  rm    Ripcord-x86_64.AppImage
-
-  chmod 755 lib plugins plugins/*
-
-  mv * "$pkgdir"/usr/lib/ripcord
+  
+  install -m644 squashfs-root/Ripcord_Icon.png "$pkgdir"/usr/share/icons/
+  
+  sed -i 's/Exec=Ripcord/Exec=\/usr\/bin\/ripcord/' squashfs-root/Ripcord.desktop
+  install -m644 squashfs-root/Ripcord.desktop "$pkgdir"/usr/share/applications
+  
+  install "$_file" "$pkgdir"/opt/ripcord
+  ln -s /opt/ripcord/"$_file" "$pkgdir"/usr/bin/ripcord
 }
+
diff --git a/ripcord.desktop b/ripcord.desktop
deleted file mode 100644
index 4c8647601087..000000000000
--- a/ripcord.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Ripcord
-GenericName=Chat Client
-Comment=An alternative Discord client
-Exec=/usr/bin/ripcord
-Icon=ripcord
-Terminal=false
-Type=Application
diff --git a/ripcord.sh b/ripcord.sh
deleted file mode 100644
index 4c00aecadcd4..000000000000
--- a/ripcord.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/lib/ripcord
-./Ripcord "${@}"