beta23

2 files changed, 19 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1d8edef9c33..2cd66e4c666d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zotero-beta
 	pkgdesc = Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share research.
-	pkgver = beta.21
+	pkgver = 5.0.97_beta.23+2Bd27b622f9
 	pkgrel = 1
 	url = https://www.zotero.org/support/dev_builds
 	arch = x86_64
@@ -31,8 +31,8 @@ pkgbase = zotero-beta
 	depends = libxrender
 	depends = libxt
 	depends = nss
-	source = https://github.com/starsareintherose/zotero-beta/releases/download/5.0.97-beta.21/zotero-beta.deb
-	sha256sums = ad4a6a85d5d98b6c8c3f189fe80e437bffe42f0968d4b608b4fa1fe460b54e9f
+	source = https://download.zotero.org/client/beta/5.0.97-beta.23%2Bd27b622f9/Zotero-5.0.97-beta.23%2Bd27b622f9_linux-x86_64.tar.bz2
+	sha256sums = 6a2ae49782f709ad699536f623d4ebf910033a849209d9b2e01ae4ee07a926bb
 
 pkgname = zotero-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f0d271ce416..beecc0e95c91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@
 
 pkgname=zotero-beta
 _pkgname=zotero-beta
-pkgver=beta.21
+pkgver=5.0.97_beta.23+2Bd27b622f9
+_pkgver=5.0.97-beta.23%2Bd27b622f9
 pkgrel=1
 pkgdesc="Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share research."
 arch=('x86_64')
@@ -37,12 +38,20 @@ depends=(
 	'libxt'
 	'nss'
 )
-source=("https://github.com/starsareintherose/zotero-beta/releases/download/5.0.97-${pkgver}/zotero-beta.deb")
-sha256sums=('ad4a6a85d5d98b6c8c3f189fe80e437bffe42f0968d4b608b4fa1fe460b54e9f')
+source=("https://download.zotero.org/client/beta/${_pkgver}/Zotero-${_pkgver}_linux-x86_64.tar.bz2")
+sha256sums=('6a2ae49782f709ad699536f623d4ebf910033a849209d9b2e01ae4ee07a926bb')
 
 package() {
-	tar -p -zxvf data.tar.gz -C "${pkgdir}"
-	chmod 755 -R ../pkg/${pkgname}/usr
-	cp -r ../pkg/${pkgname}/usr/local/* ../pkg/${pkgname}/usr/
-	rm -r ../pkg/${pkgname}/usr/local 
+  install -dDm755 "$pkgdir"/usr/{bin,share/zotero,share/applications}
+  mv "$srcdir"/Zotero_linux-x86_64/* "$pkgdir"/usr/share/zotero
+  ln -s "$pkgdir"/usr/share/zotero/zotero "$pkgdir"/usr/bin/zotero
+  ln -s "$pkgdir"/usr/share/zotero/zotero.desktop "$pkgdir"/usr/share/applications/zotero.desktop
+  # Copy zotero icons to a standard location
+  install -Dm644 "$pkgdir"/usr/share/zotero/chrome/icons/default/default16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/zotero.png
+  install -Dm644 "$pkgdir"/usr/share/zotero/chrome/icons/default/default32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/zotero.png
+  install -Dm644 "$pkgdir"/usr/share/zotero/chrome/icons/default/default48.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/zotero.png
+  install -Dm644 "$pkgdir"/usr/share/zotero/chrome/icons/default/default256.png "$pkgdir"/usr/share/icons/hicolor/256x256/apps/zotero.png
+
+  # No need to keep a shell around when launching Zotero
+  sed -i -r 's/^("\$CALLDIR\/zotero-bin" -app "\$CALLDIR\/application.ini" "\$@")/exec \1/' "$pkgdir"/usr/share/zotero/zotero
 }