removed bash script, updated sha256sums

4 files changed, 13 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f841407a85a2..562587c19fc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Fri Feb 12 02:30:11 UTC 2016
 pkgbase = libtrash
 	pkgdesc = A shared, preloaded library that implements a trash can under Linux
 	pkgver = 3.3
@@ -10,9 +12,7 @@ pkgbase = libtrash
 	makedepends = python2
 	depends = glibc
 	source = http://pages.stern.nyu.edu/~marriaga/software/libtrash/libtrash-latest.tgz
-	source = libtrash.sh
-	sha256sums = 24b4dcf03afb8feec8c1a95174a74a68c64ea400e9b8957838c62eebdc2c0b86
-	sha256sums = 9eefbca7672300d4c4c053c4ab26ebfb5095d859b8b233f11ed9c1c3e806bab2
+	sha256sums = 600b9812cdaba43a1ebfe49a1412a534853bcda3bb7c3bd3706cab89e1df5da9
 
 pkgname = libtrash
 
diff --git a/PKGBUILD b/PKGBUILD
index 97717403371c..a95be7923a7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libtrash
 pkgver=3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A shared, preloaded library that implements a trash can under Linux"
 arch=('i686' 'x86_64')
 url="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
@@ -13,9 +13,8 @@ license=('GPL')
 depends=('glibc')
 makedepends=('python2')
 install=$pkgname.install
-source=(http://pages.stern.nyu.edu/~marriaga/software/libtrash/$pkgname-latest.tgz libtrash.sh)
-sha256sums=('24b4dcf03afb8feec8c1a95174a74a68c64ea400e9b8957838c62eebdc2c0b86'
-            '9eefbca7672300d4c4c053c4ab26ebfb5095d859b8b233f11ed9c1c3e806bab2')
+source=(http://pages.stern.nyu.edu/~marriaga/software/libtrash/$pkgname-latest.tgz)
+sha256sums=('600b9812cdaba43a1ebfe49a1412a534853bcda3bb7c3bd3706cab89e1df5da9')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -27,9 +26,8 @@ build() {
 }
 
 package() {
-  install -d ${pkgdir}/usr/lib ${pkgdir}/etc/profile.d
+  install -d ${pkgdir}/usr/lib ${pkgdir}/etc/
   cd ${srcdir}/$pkgname-$pkgver
 
   make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc install
-  install -D -m 644 ${srcdir}/libtrash.sh ${pkgdir}/etc/profile.d/libtrash.sh
 }
diff --git a/libtrash.install b/libtrash.install
index 9b1d1db9db78..e59f818837d8 100644
--- a/libtrash.install
+++ b/libtrash.install
@@ -1,12 +1,11 @@
 post_install() {
-  echo ">> To enable libtrash at login:"
-  echo ">>   chmod 755 /etc/profile.d/libtrash.sh"
-  echo ">> To enable libtrash at any moment:"
-  echo ">>   . /etc/profile.d/libtrash.sh"
-  echo ">> To disable libtrash at any moment:"
+  echo ">> To enable libtrash:"
+  echo ">>   export LD_PRELOAD=/usr/lib/libtrash.sh"
+  echo ">> To disable libtrash:"
   echo ">>   unset LD_PRELOAD"
-  echo ">> WARNING: fakeroot will not work while libtrash is enabled."
-  echo ">> Disable libtrash before using fakeroot!"
+  echo ">> WARNING: a few programs might not work while libtrash is enable"
+  echo ">>          currently known: fakeroot, chromium and firefox"
+  echo ">>          disable libtrash before using any of them."
 }
 
 post_upgrade() {
diff --git a/libtrash.sh b/libtrash.sh
deleted file mode 100644
index 26c2b2db6dc6..000000000000
--- a/libtrash.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-export LD_PRELOAD=/usr/lib/libtrash.so.3.3