bashmount

2 files changed, 25 insertions, 35 deletions

diff --git a/pcr/bashmount/PKGBUILD b/pcr/bashmount/PKGBUILD
index 78f409d0c..71e6dd76b 100644
--- a/pcr/bashmount/PKGBUILD
+++ b/pcr/bashmount/PKGBUILD
@@ -1,37 +1,36 @@
-# Contributer (Arch): Jamie Nguyen <jamie@tomoyolinux.co.uk>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Jamie Nguyen <jamie@tomoyolinux.co.uk>
+# Contributer: Bill Sun <cap.sensitive@gmail.com>
+# Maintainer : Parabola Aurélien DESBRIERES <aurelien@hackers.camp>
 
 pkgname=bashmount
-pkgver=1.6.2
+pkgver=3.2.0
 pkgrel=1
-pkgdesc="A menu-driven bash script for the management of removable media with udisks"
+pkgdesc="A menu-driven bash script for the management of removable media with udisks."
 arch=('any')
-url='http://www.sourceforge.net/projects/bashmount/'
+url='https://github.com/jamielinux/bashmount'
 license=('GPL2')
-depends=('udisks')
-install=${pkgname}.install
-backup=('etc/bashmount.conf')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+optdepends=('udisks2')
+backup=(etc/bashmount.conf)
+source=("https://github.com/jamielinux/${pkgname}/archive/${pkgver}.tar.gz")
 
-build()
+package()
 {
-  cd "${srcdir}/bashmount-${pkgver}"
-	
-  # install script
-  install -D -m755 bashmount "${pkgdir}/usr/bin/bashmount"
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # install config file
-  install -D -m644 bashmount.conf "${pkgdir}/etc/bashmount.conf"
+    # Install script
+    install -D -m755 bashmount "${pkgdir}/usr/bin/bashmount"
 
-  # install man page
-  gzip -c -9 bashmount.1 > bashmount.1.gz
-  install -D -m644 bashmount.1.gz "${pkgdir}/usr/share/man/man1/bashmount.1.gz"
+    # Install config file
+    install -D -m644 bashmount.conf "${pkgdir}/etc/bashmount.conf"
 
-  # install documentation
-  install -d -m755 "${pkgdir}/usr/share/doc/bashmount"
-  install -m644 AUTHORS "${pkgdir}/usr/share/doc/bashmount/AUTHORS"
-  install -m644 COPYING "${pkgdir}/usr/share/doc/bashmount/COPYING"
-  install -m644 NEWS "${pkgdir}/usr/share/doc/bashmount/NEWS"
-}
+    # install man page
+    gzip -c -9 bashmount.1 > bashmount.1.gz
+    install -D -m644 bashmount.1.gz "${pkgdir}/usr/share/man/man1/bashmount.1.gz"
 
-sha256sums=('10e5c8f9065e2410c5018d74a3f8cf7f30668fafa30d9ed82ff04cd64a0f7309')
+    # Install documentation
+    install -d -m755 "${pkgdir}/usr/share/doc/bashmount"
+    # Currently the source code doesn't have an 'AUTHORS' file
+    #install -m644 AUTHORS "${pkgdir}/usr/share/doc/bashmount/AUTHORS"
+    install -m644 COPYING "${pkgdir}/usr/share/doc/bashmount/COPYING"
+    install -m644 NEWS "${pkgdir}/usr/share/doc/bashmount/NEWS"
+}
diff --git a/pcr/bashmount/bashmount.install b/pcr/bashmount/bashmount.install
deleted file mode 100644
index 6e646d94b..000000000
--- a/pcr/bashmount/bashmount.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install () {
-  echo
-  echo " * dbus and consolekit/policykit need to be running. If you are not"
-  echo "   using a graphical login manager, put this in ~/.xinitrc:"
-  echo
-  echo "      source /etc/X11/xinit/xinitrc.d/30-dbus"
-  echo "      exec ck-launch-session [insert window manager here]"
-  echo
-}