Merge branch 'rewrite-pkgbuild' into 'master'

Rewrite PKGBUILD to extract AppImage instead of installing it

See merge request dev/core/1password-archlinux-aur!6

2 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b6ce801c5bc..0cad4da62eb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 1password
 	pkgdesc = Password manager and secure wallet
 	pkgver = 0.9.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://1password.com/
 	arch = x86_64
 	license = LicenseRef-1Password-Proprietary
@@ -10,8 +10,8 @@ pkgbase = 1password
 	depends = hicolor-icon-theme
 	noextract = 1password-0.9.6.AppImage
 	options = !strip
-	source = 1password-0.9.6.AppImage::https://downloads.1password.com/linux/appimage/1password-0.9.6.AppImage
-	source = 1password-0.9.6.AppImage.sig::https://downloads.1password.com/linux/appimage/1password-0.9.6.AppImage.sig
+	source = https://downloads.1password.com/linux/appimage/1password-0.9.6.AppImage
+	source = https://downloads.1password.com/linux/appimage/1password-0.9.6.AppImage.sig
 	validpgpkeys = 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
 	sha256sums = 3030306a875ccd97242218f8af56af0c2cdcd0c978fc365c8440bc345a51c410
 	sha256sums = cee3a7c1309ed2179a985dc3812a6c3a1ec12938e83fa8914f3a4a1d2547731e
diff --git a/PKGBUILD b/PKGBUILD
index 6b66fefdc9d1..ad26beb2e211 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,14 @@ pkgname=1password
 _appimagver=0.9.6
 _appimage="${pkgname}-${_appimagver}.AppImage"
 pkgver=${_appimagver//-/_}
-pkgrel=1
+pkgrel=2
 pkgdesc="Password manager and secure wallet"
 arch=('x86_64')
 url='https://1password.com/'
 license=('LicenseRef-1Password-Proprietary')
 depends=('fuse2' 'zlib' 'hicolor-icon-theme')
 options=(!strip)
-source=("${_appimage}::https://downloads.1password.com/linux/appimage/${_appimage}"
-        "${_appimage}.sig::https://downloads.1password.com/linux/appimage/${_appimage}.sig"
-)
+source=(https://downloads.1password.com/linux/appimage/${_appimage}{,.sig})
 noextract=("${_appimage}")
 sha256sums=('3030306a875ccd97242218f8af56af0c2cdcd0c978fc365c8440bc345a51c410'
             'cee3a7c1309ed2179a985dc3812a6c3a1ec12938e83fa8914f3a4a1d2547731e'
@@ -19,26 +17,30 @@ sha256sums=('3030306a875ccd97242218f8af56af0c2cdcd0c978fc365c8440bc345a51c410'
 validpgpkeys=('3FEF9748469ADBE15DA7CA80AC2D62742012EA22')
 
 prepare() {
+    # Enable execution of AppImage
     chmod +x "${_appimage}"
+    # Extract AppImage into squashfs-root folder
     ./"${_appimage}" --appimage-extract
+    # Set permissions for squashfs-root folder
+    chmod -R 0755 squashfs-root
 }
 
 package() {
+    # Go to source directory
     cd "$srcdir"
 
-    # Create Directories
-    install -d "${pkgdir}/usr/bin"
-    install -dm755 "${pkgdir}/usr/share/icons/hicolor"
-
-    # Install AppImage
-    install -Dm755 "${_appimage}" -t "${pkgdir}/opt/${pkgname}"
-
-    # Install Icons, Desktop Shortcut
-    find squashfs-root -type d -exec chmod 0755 {} \;
-    cp -r squashfs-root/usr/share/icons/hicolor "${pkgdir}/usr/share/icons/"
-    sed -i -E "s|Exec=AppRun|Exec=env DESKTOPINTEGRATION=false /usr/bin/${pkgname}|" "squashfs-root/${pkgname}.desktop"
-    install -Dm644 "squashfs-root/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
-
-    # Symlink AppImage
-    ln -s "/opt/${pkgname}/${_appimage}" "${pkgdir}/usr/bin/${pkgname}"
+    # Create directories for installation
+    install -dm0755 "${pkgdir}"/usr/bin
+    install -dm0755 "${pkgdir}"/opt
+    install -dm0755 "${pkgdir}"/usr/share/icons
+    # Install icons
+    cp -r squashfs-root/usr/share/icons/hicolor "${pkgdir}"/usr/share/icons/
+    # Modify .desktop file to run executable instead of AppImage
+    sed -i -E "s|Exec=AppRun|Exec=/usr/bin/${pkgname}|" squashfs-root/${pkgname}.desktop
+    # Install desktop file
+    install -Dm644 squashfs-root/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications/
+    # Move package contents to opt
+    mv squashfs-root "${pkgdir}"/opt/${pkgname}
+    # Symlink /usr/bin executable to opt
+    ln -s /opt/${pkgname}/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
 }