Merge branch 'release/8.0.32' into 'master'

upgpkg: 1password 8.0.32

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

3 files changed, 30 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15412a1c199f..4e1890b04a1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = 1password
 	pkgdesc = Password manager and secure wallet
-	pkgver = 8.0.30
+	pkgver = 8.0.32
 	pkgrel = 1
 	url = https://1password.com
 	install = 1password.install
 	arch = x86_64
 	license = LicenseRef-1Password-Proprietary
-	depends = fuse2
-	depends = zlib
 	depends = hicolor-icon-theme
-	noextract = 1password-8.0.30.AppImage
 	options = !strip
-	source = https://downloads.1password.com/linux/appimage/1password-8.0.30.AppImage
-	source = https://downloads.1password.com/linux/appimage/1password-8.0.30.AppImage.sig
+	source = https://downloads.1password.com/linux/tar/1password-8.0.32.tar.gz
+	source = https://downloads.1password.com/linux/tar/1password-8.0.32.tar.gz.sig
 	validpgpkeys = 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
-	sha256sums = 8fe7e9fdff27b5af8e3ae3855389a652b198955980a9d6973b8acb2748a7fa6f
-	sha256sums = 7a65bef1556faa93fde9ffbc3ee99e4110ef3c06535538f3699b7812464f450a
+	sha256sums = 78e207b4e70d4fff86e71eb3300c543427fc993263611bad20bd5e74a481cbe9
+	sha256sums = 78760f2c792c6a46af8139ac75ff3f2a9ab96c6f1dac6967c7ce9be61dd287d8
 
 pkgname = 1password
 
diff --git a/1password.install b/1password.install
index 446df885dd76..4f90d35b7a3f 100755
--- a/1password.install
+++ b/1password.install
@@ -27,7 +27,7 @@ pre_upgrade() {
 
 post_install() {
     # Setup the Core App Integration helper binary with the correct permissions and group
-    HELPER_PATH="/opt/1password/1Password-KeyringHelper"
+    HELPER_PATH="/opt/1Password/1Password-KeyringHelper"
 
     chgrp "${GROUP_NAME}" $HELPER_PATH
     # The binary requires setuid so it may interact with the Kernel keyring facilities
@@ -37,7 +37,7 @@ post_install() {
 
 post_upgrade() {
     # Setup the Core App Integration helper binary with the correct permissions and group
-    HELPER_PATH="/opt/1password/1Password-KeyringHelper"
+    HELPER_PATH="/opt/1Password/1Password-KeyringHelper"
 
     chgrp "${GROUP_NAME}" $HELPER_PATH
     # The binary requires setuid so it may interact with the Kernel keyring facilities
diff --git a/PKGBUILD b/PKGBUILD
index 0f62022f8883..4b7107a26cab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,42 @@
 pkgname=1password
-_appimagver=8.0.30
-_appimage="${pkgname}-${_appimagver}.AppImage"
-pkgver=${_appimagver//-/_}
+_tarver=8.0.32
+_tar="${pkgname}-${_tarver}.tar.gz"
+pkgver=${_tarver//-/_}
 pkgrel=1
 pkgdesc="Password manager and secure wallet"
 arch=('x86_64')
 url='https://1password.com'
 license=('LicenseRef-1Password-Proprietary')
-depends=('fuse2' 'zlib' 'hicolor-icon-theme')
+depends=('hicolor-icon-theme')
 options=(!strip)
 install="${pkgname}.install"
-source=(https://downloads.1password.com/linux/appimage/${_appimage}{,.sig})
-noextract=("${_appimage}")
-sha256sums=('8fe7e9fdff27b5af8e3ae3855389a652b198955980a9d6973b8acb2748a7fa6f'
-            '7a65bef1556faa93fde9ffbc3ee99e4110ef3c06535538f3699b7812464f450a'
+source=(https://downloads.1password.com/linux/tar/${_tar}{,.sig})
+sha256sums=('78e207b4e70d4fff86e71eb3300c543427fc993263611bad20bd5e74a481cbe9'
+            '78760f2c792c6a46af8139ac75ff3f2a9ab96c6f1dac6967c7ce9be61dd287d8'
 )
 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"
+    cd "${pkgname}-${_tarver}"
 
-    # 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
+    icons=(usr/share/icons/hicolor/*/${pkgname}.png)
+    for icon in "${icons[@]}"
+    do
+        install -Dm0644 "${icon}" "${pkgdir}/${icon}"
+    done
     # 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}
+    install -Dm0644 usr/share/applications/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications/
     # Install system unlock PolKit policy file
-    install -Dm0644 "${pkgdir}"/opt/${pkgname}/com.1password.1Password.policy -t "${pkgdir}"/usr/share/polkit-1/actions/
+    install -Dm0644 com.1password.1Password.policy -t "${pkgdir}"/usr/share/polkit-1/actions/
+
+    # Move package contents to /opt/1Password
+    cd "${srcdir}"
+    install -dm0755 "${pkgdir}"/opt
+    mv "${pkgname}-${_tarver}" "${pkgdir}/opt/1Password"
+
     # Symlink /usr/bin executable to opt
-    ln -s /opt/${pkgname}/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
+    install -dm0755 "${pkgdir}"/usr/bin
+    ln -s /opt/1Password/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
 }