Clean up the script

1 files changed, 39 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index dc1dbcff1858..be8600aef75d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer xgdgsc<xgdgsc@gmail.com>
+# Maintainer: xgdgsc <xgdgsc at gmail dot com>
+# Maintainer: Alesandar Trifunović <akstrfn at gmail dot com>
 
 pkgname=mendeleydesktop
 pkgver=1.18
@@ -8,34 +9,45 @@ url=http://www.mendeley.com/release-notes/
 arch=(i686 x86_64)
 depends=(qt5-webengine)
 license=(custom:mendeley_eula)
-sha512sums_i686=('63a82863a824e5ce180a31453e68c900ba4bcebf0c228f515db87fe523a3cef8a284dd8c81729741fe7c9795b918d7a25503024aa63692014ce5e4a87a7cad11')
-sha512sums_x86_64=('9e72ca02beae2412fb427cfc22da3495ae0bcdcc23b188e5f09e4e29a942a276635be54bf22bbcf08c63cdee102c257c145cce00a361c4b8b48e0f538a81b108')
+sha512sums=('9e72ca02beae2412fb427cfc22da3495ae0bcdcc23b188e5f09e4e29a942a276635be54bf22bbcf08c63cdee102c257c145cce00a361c4b8b48e0f538a81b108')
 
 if [[ $CARCH = i686 ]];then
-  _arch=i486
-else
-  _arch=$CARCH
+    $CARCH=i486
+    sha512sums=('63a82863a824e5ce180a31453e68c900ba4bcebf0c228f515db87fe523a3cef8a284dd8c81729741fe7c9795b918d7a25503024aa63692014ce5e4a87a7cad11')
 fi
 
-source_i686=("https://desktop-download.mendeley.com/download/linux/$pkgname-$pkgver-linux-i486.tar.bz2")
-source_x86_64=("https://desktop-download.mendeley.com/download/linux/$pkgname-$pkgver-linux-x86_64.tar.bz2")
+source=("https://desktop-download.mendeley.com/download/linux/$pkgname-$pkgver-linux-$CARCH.tar.bz2")
 
-package() {
-    cd "$pkgname-$pkgver-linux-$_arch"
-
-    rm -f share/doc/mendeleydesktop/*.txt
-    # Using shared libraries so remove bundled ones
+prepare() {
+    cd "$pkgname-$pkgver-linux-$CARCH"
+    # Using shared libraries so remove the bundled ones
     rm -rf lib/cpp lib/qt lib/ssl lib/libpng12.so.0 lib/mendeleydesktop/plugins
     rm -rf lib/mendeleydesktop/libexec/resources
     rm -rf lib/mendeleydesktop/libexec/translations/qtwebengine_locales
-    # Link resources from system Qt
-    ln -s /usr/share/qt/resources lib/mendeleydesktop/libexec/
-    ln -s /usr/share/qt/translations/qtwebengine_locales lib/mendeleydesktop/libexec/translations/
 
-    install -dm755 "$pkgdir/opt/$pkgname/"
-    mv bin lib share "$pkgdir/opt/$pkgname/"
+    # TODO Run install-mendeley-link-handler.sh for gconf or just remove it?
+    rm bin/install-mendeley-link-handler.sh
+
+    # # Remove unneeded lines if gconf is not installed.
+    # if ! which gconftool-2 &>/dev/null;then
+    # sed -i '/GCONF/d' \
+    #     "$pkgdir"/opt/"$pkgname"/bin/install-mendeley-link-handler.sh
+    # fi
+}
+
+package() {
+    cd "$pkgname-$pkgver-linux-$CARCH"
+
+    # Link system Qt
+    ln -s /usr/share/qt/resources \
+          lib/mendeleydesktop/libexec/
+    ln -s /usr/share/qt/translations/qtwebengine_locales \
+          lib/mendeleydesktop/libexec/translations/
+
+    install -d "$pkgdir/opt/$pkgname/"
+    cp -a bin lib share "$pkgdir/opt/$pkgname/"
 
-    # Replace default python laucher with custom sh
+    # Replace default python laucher with custom bash
 cat <<'EOF' > "$pkgdir/opt/$pkgname/bin/mendeleydesktop"
 #!/bin/bash
 export LD_LIBRARY_PATH=/usr/lib/:/opt/mendeleydesktop/lib/:/usr/lib/qt/
@@ -43,23 +55,16 @@ export MENDELEY_BUNDLED_QT_PLUGIN_PATH=/lib/qt/plugins/
 /opt/mendeleydesktop/lib/mendeleydesktop/libexec/mendeleydesktop.x86_64 "$@"
 EOF
 
-    install -dm755 "$pkgdir"/usr/bin
-    ln -s "/opt/$pkgname/bin/mendeleydesktop" "$pkgdir/usr/bin/mendeleydesktop"
+    install -d "$pkgdir"/usr/bin
+    ln -s "/opt/$pkgname/bin/mendeleydesktop" \
+          "$pkgdir/usr/bin/mendeleydesktop"
 
-    cd "$srcdir/$pkgname-$pkgver-linux-$_arch"
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 share/applications/mendeleydesktop.desktop \
+                   "$pkgdir"/usr/share/applications/mendeleydesktop.desktop
 
-    install -dm755 "$pkgdir"/usr/share/applications
-    ln -s /opt/"$pkgname"/share/applications/mendeleydesktop.desktop "$pkgdir"/usr/share/applications/
+    cp -a "$pkgdir/opt/$pkgname/share/icons" "$pkgdir/usr/share/icons"
 
-    # Remove unneeded lines if gconf is not installed.
-    if ! which gconftool-2 &>/dev/null;then
-    sed -i  '/GCONF/d' \
-        "$pkgdir"/opt/"$pkgname"/bin/install-mendeley-link-handler.sh
-    fi
-    for size in 16 22 32 48 64 128;do
-        install -dm755 "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps
-        ln -s /opt/"$pkgname"/share/icons/hicolor/${size}x${size}/apps/"${pkgname}".png \
-          "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps
-    done
+    # Clean share from opt (don't remove mendeleydesktop)
+    rm -rf "$pkgdir/opt/$pkgname/share/"{applications,doc,icons}
 }