Use AppImage

2 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07663ee6ead4..89ec442d1ee9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,11 +23,13 @@ pkgbase = onivim2-bin
 	provides = onivim2
 	conflicts = onivim2
 	options = !strip
-	source = https://github.com/santilococo/oni2/releases/download/v0.5.7/AppDir.tar
-	source = https://github.com/santilococo/oni2/releases/download/v0.5.7/AppCache.tar
+	source = onivim2-bin-0.5.7.AppImage::https://github.com/santilococo/oni2/releases/download/v0.5.7/Onivim2-x86_64.AppImage
+	source = onivim2-bin.png::https://raw.githubusercontent.com/santilococo/oni2/master/assets/images/logo.png
+	source = onivim2-bin.desktop::https://raw.githubusercontent.com/santilococo/oni2/master/scripts/linux/Onivim2.desktop
 	source = https://raw.githubusercontent.com/santilococo/oni2/master/LICENSE.md
-	sha256sums = 298bf2e27df94a3018be0366a70c82f41e59c7b018cb43448d4ed516755ba818
-	sha256sums = 7009fd05c2c1063632a72a54be29be78e9ef9b62238ae55c805a51227eb7cf78
+	sha256sums = 191528f7eeddd3c2ab35464e5418125920a612235037f26af12571579a451ae4
+	sha256sums = bb4938b950454bf4123a7d9850bd98da295811ad20491992de2b6b1da2759967
+	sha256sums = 255ddde65a19106a3f77acfae88e5003db09e86f1564a8435f2a42866c0e4c34
 	sha256sums = 32edcecd2c392702a06ee4490d839d8a6da786deb6ca0430f16655e071f0760a
 
 pkgname = onivim2-bin
diff --git a/PKGBUILD b/PKGBUILD
index e5b0a89b04cc..63745c2016d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,26 +14,20 @@ makedepends=("glib2" "acl" "libxcursor" "libxrandr" "libxi" "libxinerama"
 provides=('onivim2')
 conflicts=('onivim2')
 options=('!strip')
-source=("${url}/releases/download/v${pkgver}/AppDir.tar"
-        "${url}/releases/download/v${pkgver}/AppCache.tar"
+source=("${pkgname}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/Onivim2-x86_64.AppImage"
+        "${pkgname}.png::https://raw.githubusercontent.com/santilococo/oni2/master/assets/images/logo.png"
+        "${pkgname}.desktop::https://raw.githubusercontent.com/santilococo/oni2/master/scripts/linux/Onivim2.desktop"
         "https://raw.githubusercontent.com/santilococo/oni2/master/LICENSE.md")
-sha256sums=('298bf2e27df94a3018be0366a70c82f41e59c7b018cb43448d4ed516755ba818'
-            '7009fd05c2c1063632a72a54be29be78e9ef9b62238ae55c805a51227eb7cf78'
+sha256sums=('191528f7eeddd3c2ab35464e5418125920a612235037f26af12571579a451ae4'
+            'bb4938b950454bf4123a7d9850bd98da295811ad20491992de2b6b1da2759967'
+            '255ddde65a19106a3f77acfae88e5003db09e86f1564a8435f2a42866c0e4c34'
             '32edcecd2c392702a06ee4490d839d8a6da786deb6ca0430f16655e071f0760a')
 
 package() {
-    cd "${srcdir}/_release/Onivim2.AppDir"
+    cd "${srcdir}"
 
-    install -dm755 "${pkgdir}/opt/${_pkgname}"
-    install -dm755 "${pkgdir}/usr/bin/"
-    install -Dm644 "${srcdir}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
-    install -Dm644 Onivim2.desktop "${pkgdir}/usr/share/applications/Onivim2.desktop"
-    install -Dm644 Onivim2.png "${pkgdir}/usr/share/pixmaps/Onivim2.png"
-    cp -Lr {AppRun,usr} "${pkgdir}/opt/${_pkgname}"
-    cp -r "${srcdir}/AppCache/camomile" "${pkgdir}/opt/${_pkgname}/usr/share"
-    ln -s /opt/onivim2/AppRun "${pkgdir}/usr/bin/Oni2"
-    find "${pkgdir}" -type f -exec chmod 644 {} \;
-    chmod 755 "${pkgdir}"/opt/onivim2/AppRun \
-        "${pkgdir}"/opt/onivim2/usr/bin/{Oni2*,node,rg} \
-        "${pkgdir}"/opt/onivim2/usr/lib/*
+    install -Dm755 "${pkgname}-${pkgver}.AppImage" "${pkgdir}"/usr/bin/Oni2
+    install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "${pkgname}".desktop "${pkgdir}/usr/share/applications/Onivim2.desktop"
+    install -Dm644 "${pkgname}".png "${pkgdir}/usr/share/pixmaps/Onivim2.png"
 }