fix configuration parsing

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6576daf6c8b..710260ba0114 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = paccache-hook
 	pkgdesc = A configurable hook to cleanup the pacman package cache using paccache
-	pkgver = 1.1.0
+	pkgver = 1.1.1
 	pkgrel = 1
 	arch = any
 	license = BSD
@@ -10,9 +10,8 @@ pkgbase = paccache-hook
 	source = paccache-hook.conf
 	source = paccache-hook.sh
 	source = paccache-hook.hook
-	sha256sums = 0aba81744ed33eae4fbb135da75d905baab46362f0230e7c7a833c4e8734ccfc
-	sha256sums = 2a4b997c371956d2a03d1ba8ae5b54fc403e354231b6c6798ae7b0d18d06cdee
-	sha256sums = fdd80cc2ec88445ac9c5fadf2b4053eb0d4864485952a8d9858d6cc3d34c97ce
+	b2sums = c1d92590b4426c52a22152ca4901126ba2622e78ec14eba9be2a9e41f909ddceee01beb8fc4e95a12cd8ed78cb31a12118b0c16ea1498718397f04862c613408
+	b2sums = b58919eff78e6b63ce0cd724a49c4d39fb2ab37920e14173560485f0d434a6a96b065f9342fa162e8f7a346bd22522fc7b80f7991d2f4ab9df3815f813160aa7
+	b2sums = ebc6394bd960fd6f2bb26593be20461adf8e251124787e98664343426c9cdec04bfff7677aba0e78d6f43b885f40e415243b683473eaecd082e5f3ef83cc53ab
 
 pkgname = paccache-hook
-
diff --git a/PKGBUILD b/PKGBUILD
index 27991c958227..87d5bf8b550b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Felix Barz <skycoder42.de@gmx.de>
 pkgname=paccache-hook
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="A configurable hook to cleanup the pacman package cache using paccache"
 arch=('any')
@@ -8,11 +8,11 @@ license=('BSD')
 depends=('pacman-contrib')
 conflicts=('pacman-cleanup-hook')
 source=("$pkgname.conf"
-		"$pkgname.sh"
-		"$pkgname.hook")
-sha256sums=('0aba81744ed33eae4fbb135da75d905baab46362f0230e7c7a833c4e8734ccfc'
-            '2a4b997c371956d2a03d1ba8ae5b54fc403e354231b6c6798ae7b0d18d06cdee'
-            'fdd80cc2ec88445ac9c5fadf2b4053eb0d4864485952a8d9858d6cc3d34c97ce')
+        "$pkgname.sh"
+        "$pkgname.hook")
+b2sums=('c1d92590b4426c52a22152ca4901126ba2622e78ec14eba9be2a9e41f909ddceee01beb8fc4e95a12cd8ed78cb31a12118b0c16ea1498718397f04862c613408'
+        'b58919eff78e6b63ce0cd724a49c4d39fb2ab37920e14173560485f0d434a6a96b065f9342fa162e8f7a346bd22522fc7b80f7991d2f4ab9df3815f813160aa7'
+        'ebc6394bd960fd6f2bb26593be20461adf8e251124787e98664343426c9cdec04bfff7677aba0e78d6f43b885f40e415243b683473eaecd082e5f3ef83cc53ab')
 backup=("etc/$pkgname.conf")
 
 package() {
diff --git a/paccache-hook.hook b/paccache-hook.hook
index 3cf8cfdc2c23..ac2e00ebb1ea 100644
--- a/paccache-hook.hook
+++ b/paccache-hook.hook
@@ -8,4 +8,4 @@ Target = *
 [Action]
 Description = Removing old packages from pacman cache...
 When = PostTransaction
-Exec = /usr/bin/sh /usr/share/libalpm/scripts/paccache-hook.sh
+Exec = /usr/bin/bash /usr/share/libalpm/scripts/paccache-hook.sh
diff --git a/paccache-hook.sh b/paccache-hook.sh
index 78d48a43ca9e..ce134e7d3a47 100644
--- a/paccache-hook.sh
+++ b/paccache-hook.sh
@@ -1,13 +1,14 @@
-#!/bin/sh
+#!/bin/bash
+set -e
 
 . /etc/paccache-hook.conf
 
 cache_args=""
-for cdir in $cache_dirs; do
+for cdir in ${cache_dirs[@]}; do
 	cache_args="$cache_args -c $cdir"
 done
 
-if [ "$installed" = true ]; then
+if [ "$installed" = "true" ]; then
 	echo "Removing old installed packages..."
 	if [ -n "$installed_move_to" ]; then
 		paccache $cache_args -m "$installed_move_to" "-k${installed_keep:-2}" $extra_args $installed_extra_args
@@ -16,7 +17,7 @@ if [ "$installed" = true ]; then
 	fi
 fi
 
-if [ "$uninstalled" = true ]; then
+if [ "$uninstalled" = "true" ]; then
 	echo "Removing old uninstalled packages..."
 	if [ -n "$uninstalled_move_to" ]; then
 		paccache $cache_args -m "$uninstalled_move_to" "-uk${uninstalled_keep:-0}" $extra_args $uninstalled_extra_args