Proper installation of icons

3 files changed, 29 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc4f77113acd..71248c8a89ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,8 @@ pkgbase = sendanywhere
 	license = custom:sendanywhere_eula
 	makedepends = binutils
 	makedepends = tar
+	makedepends = xdg-utils
+	makedepends = desktop-file-utils
 	provides = sendanywhere
 	source_i686 = https://update.send-anywhere.com/linux_downloads/sendanywhere_latest_i386.deb
 	depends_i686 = lib32-gtk2
diff --git a/PKGBUILD b/PKGBUILD
index 7d3b951c9319..6499a704d231 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 url="https://www.send-anywhere.com"
 license=('custom:sendanywhere_eula')
 provides=('sendanywhere')
-makedepends=('binutils' 'tar')
+makedepends=('binutils' 'tar' 'xdg-utils' 'desktop-file-utils')
 install=$pkgname.install
 depends_i686=('lib32-gtk2' 'lib32-libsm')
 depends_x86_64=('gcc-libs>=4.6.3' 'glibc>=2.15' 'postgresql-libs' 'qt5-svg' 'gtk2')
@@ -30,7 +30,7 @@ _dpkg_x_alternative() {
    ar xv "$_filename"
    tar xJf data.tar.xz
    tar xzf control.tar.gz
-   mv usr opt md5sums "$pkgdir"
+   mv usr opt "$pkgdir"
 }
 
 package() {
@@ -39,17 +39,11 @@ package() {
 
    echo '==> Verify MD5 checksums'
    cd ${pkgdir}
-   md5sum -c md5sums
+   md5sum -c ${srcdir}/md5sums
 
    echo '==> Copying license.'
    install -Dm644 "$pkgdir/usr/share/doc/sendanywhere/copyright"\
        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-   echo '==> Symlinking icons.'
-   for size in 16 22 24 32 48 64 128 256;do
-       install -dm755 "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps
-       ln -s /opt/estmob/"$pkgname"/"$pkgname"_icon_${size}.png \
-          "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/estmob-$pkgname.png
-   done
 }
 
diff --git a/sendanywhere.install b/sendanywhere.install
index d510df3cd212..7f5d4aaf5599 100644
--- a/sendanywhere.install
+++ b/sendanywhere.install
@@ -1,6 +1,13 @@
 post_install()
 {
-    xdg-icon-resource forceupdate --theme hicolor
+    echo '==> Installing icons.'
+    for icon in "/opt/estmob/sendanywhere/sendanywhere_icon_"*.png; do
+        size="${icon##*_}"
+        size="${size%.png}"
+
+        xdg-icon-resource install --size "$size" "$icon" "estmob-sendanywhere"
+    done
+
     update-mime-database /usr/share/mime &> /dev/null 2> /dev/null
     update-desktop-database > /dev/null 2>&1 
 }
@@ -10,9 +17,24 @@ post_upgrade()
     post_install
 }
 
+
+pre_remove() {
+    # killall /usr/bin/sendanywhere
+
+    echo '==> Uninstalling icons.'
+    for icon in "/opt/estmob/sendanywhere/sendanywhere_icon_"*.png; do
+        size="${icon##*_}"
+        size="${size%.png}"
+
+        xdg-icon-resource uninstall --size "$size" "$icon" "estmob-sendanywhere"
+    done
+
+    update-mime-database /usr/share/mime &> /dev/null
+    update-desktop-database > /dev/null 2>&1 
+}
+
 post_remove()
 {
-    post_install
     rm -rf "$HOME/.local/share/Estmob"
     rm -rf "$HOME/.config/autostart/sendanywhere.desktop"
 }