update to 0.9.1

6 files changed, 37 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8bbc5ae102c..667b4432f087 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = alva-appimage
 	pkgdesc = Create living prototypes with code components.
-	pkgver = 0.8.0
+	pkgver = 0.9.1
 	pkgrel = 1
-	url = https://meetalva.io
-	arch = i686
+	url = https://meetalva.io/
 	arch = x86_64
 	license = MIT
-	provides = alva
+	depends = zlib
+	depends = glibc
+	depends = hicolor-icon-theme
 	conflicts = alva
 	options = !strip
-	source = https://github.com/meetalva/alva/releases/download/v0.8.0/Alva-0.8.0.AppImage
-	source = alva.sh
-	md5sums = abad794dd58818065a1f9133e7aef566
-	md5sums = SKIP
+	source = alva-0.9.1.AppImage::https://github.com/meetalva/alva/releases/download/v0.9.1/Alva-0.9.1.AppImage
+	source = LICENSE::https://github.com/meetalva/alva/raw/master/LICENSE
+	sha256sums = da5d279034825e48538273412f66016e35178684c59f3b11aa03e93a6f700c0d
+	sha256sums = c69d22024d1f29a64a050718f5b1f2af7647cb0ef99136fb5a7f9647caf1e246
 
 pkgname = alva-appimage
-
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0988a1bb9027..000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-  - docker
-script:
-  - docker-compose run --rm makepkg
diff --git a/PKGBUILD b/PKGBUILD
index 9f60aabb6474..5b0cfb560669 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,34 @@
-# Maintainer: rsteube <rsteube@users.noreply.github.com>
-_pkgname=alva
+# Contributor: rsteube <rsteube@users.noreply.github.com>
+# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=alva-appimage
-pkgver=0.8.0
+_appname=Alva
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="Create living prototypes with code components."
-arch=("i686" "x86_64")
-url="https://meetalva.io"
+arch=('x86_64')
+url="https://meetalva.io/"
+_githuburl="https://github.com/meetalva/alva"
 license=('MIT')
-provides=(alva)
-conflicts=(alva)
+provides=()
+depends=('zlib' 'glibc' 'hicolor-icon-theme')
 options=(!strip)
-source=("https://github.com/meetalva/alva/releases/download/v${pkgver}/Alva-${pkgver}.AppImage"
-        "alva.sh")
-md5sums=(abad794dd58818065a1f9133e7aef566
-         SKIP)
-
+conflicts=("${pkgname%-appimage}")
+_install_path="/opt/appimages"
+source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/${_appname}-${pkgver}.AppImage"
+  "LICENSE::${_githuburl}/raw/master/LICENSE")
+sha256sums=('da5d279034825e48538273412f66016e35178684c59f3b11aa03e93a6f700c0d'
+            'c69d22024d1f29a64a050718f5b1f2af7647cb0ef99136fb5a7f9647caf1e246')
+prepare() {
+    chmod a+x "${pkgname%-appimage}-${pkgver}.AppImage"
+    "./${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed 's|AppRun|/opt/appimages/alva.AppImage|g;s|Icon=Alva|Icon=alva|g' -i "${srcdir}/squashfs-root/${_appname}.desktop"
+}  
 package() {
-  sed -i "s/\${pkgver}/${pkgver}/" "${srcdir}/alva.sh"
-
-  install -D -m 755  "${srcdir}/Alva-${pkgver}.AppImage" "${pkgdir}/opt/appimages/Alva-${pkgver}.AppImage"
-  install -D -m 755  "${srcdir}/alva.sh" "${pkgdir}/usr/bin/alva"
-}
+  install -Dm755 "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${pkgname%-appimage}.AppImage"
+  install -Dm644 "${srcdir}/squashfs-root/${_appname}.desktop" -t "${pkgdir}/usr/share/applications/${pkgname%-appimage}.desktop"
+  install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  for _icons in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256 512x512 1024x1024;do
+    install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-appimage}.png"
+  done
+}
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index 93c714eca0fc..000000000000
--- a/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Alva AUR package
-
-Official sources for the Alva AUR package (https://github.com/meetalva/alva-aur).
-AUR repository: https://aur.archlinux.org/alva-appimage.git
-
-# Updating Version
-
-refer to https://wiki.archlinux.org/index.php/Creating_packages
-
-- update `pkgver` to Alva version
-- increase `pkgrel` on any changes to PKGBUILD itself, reset to 1 on any updates to `pkgver`
-- update `md5sums` (Appimage)
-- recreate `.SRCINFO` (`docker-compose run --rm makepkg`)
-- verify everything works and push changes to AUR (careful: latest commit on master is directly released)
-
-
diff --git a/alva.sh b/alva.sh
deleted file mode 100644
index 2d0d2386a300..000000000000
--- a/alva.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-DESKTOPINTEGRATION=0 /opt/appimages/Alva-${pkgver}.AppImage --disable-gpu
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 58e13ddf3bd9..000000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: '3'
-
-services:
-  makepkg:
-    image: imrehg/archlinux-makepkg
-    volumes:
-      - '.:/home/builder/'
-    command: sh -c "makepkg --printsrcinfo > .SRCINFO && makepkg -f"
-
-