Merge branch 'master' into xbs

Conflicts:
	src/lib/conf.sh

1 files changed, 4 insertions, 4 deletions

diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff
index 9f5ae27..ebd749d 100755
--- a/src/abslibre-tools/libreaddiff
+++ b/src/abslibre-tools/libreaddiff
@@ -74,14 +74,14 @@ except StopIteration:
             load_PKGBUILD "$f/PKGBUILD" || continue
             is_here=false
             for arc in ${arch[@]} ; do
-                if [ "$arc" = "any" -o "$arc" = "$CARCH" ] ; then
+                if [[ "$arc" == "any" ]] || [[ "$arc" == "$CARCH" ]] ; then
                     is_here=true
                     break
                 fi
             done
-            if [ "$is_here" = "true" ] ; then
-                for name in ${pkgname[@]} ; do
-                    if [ -z "$epoch" ] ; then
+            if [[ "$is_here" == "true" ]] ; then
+                for name in "${pkgname[@]}" ; do
+                    if [[ -z "$epoch" ]] ; then
                         echo $name-$pkgver-$pkgrel
                     else
                         echo $name-$epoch:$pkgver-$pkgrel