Merge branch 'master' into xbs

Conflicts:
	src/lib/conf.sh

4 files changed, 13 insertions, 12 deletions

diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir
index 8e88375..4421ae2 100755
--- a/src/abslibre-tools/createworkdir
+++ b/src/abslibre-tools/createworkdir
@@ -42,10 +42,11 @@ if ! "${cmd[@]}"; then
 	plain "Try running this command:"
 	echo
 	printf '%q ' "${cmd[@]}"
+	echo
 	exit 1
 fi
 
 msg "Finished, your packaging directory tree looks like this now:"
-ls --color=always "${WORKDIR}"/*/*
+ls --color=always "${WORKDIR}"/*
 
 trap -- EXIT
diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree
index b3e2327..1ef0649 100755
--- a/src/abslibre-tools/diff-unfree
+++ b/src/abslibre-tools/diff-unfree
@@ -23,7 +23,7 @@
 . libremessages
 . $(librelib conf.sh)
 load_files libretools
-check_vars libretools DIFFTOOL || exit 1
+check_vars libretools DIFFPROG || exit 1
 
 usage() {
 	print "Usage: %s [community|packages] [unfree-package] [repo]" "${0##*/}"
@@ -80,7 +80,7 @@ main() {
 
 	for _file in ${unfree_dir}/*; do
 		msg2 "%s" "$(basename "${_file}")"
-		${DIFFTOOL} "$PWD/$(basename "${_file}")" "${_file}"
+		${DIFFPROG} "$PWD/$(basename "${_file}")" "${_file}"
 	done
 }
 
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
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index adfb935..b77b6ec 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -68,7 +68,7 @@ create_signature() {
 		SIGNWITHKEY="-u ${GPGKEY}"
 	fi
 	# The signature will be generated directly in ascii-friendly format
-	gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null || ret=$?
+	gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" || ret=$?
 
 
 	if (( ! ret )); then
@@ -80,12 +80,12 @@ create_signature() {
 }
 
 sign_packages() {
-	if [ -z "${GPG_AGENT_INFO}" ]; then
-		warning "It's better to use gpg-agent to sign packages in batches"
+	if [[ -z "${GPG_AGENT_INFO}" ]]; then
+		warning "It's better to have \`%s\` running to sign packages in batches" 'gpg-agent --daemon'
 	fi
 
 	for package in $(find "${WORKDIR}/staging/" -type f -iname '*.pkg.tar.?z'); do
-		if [ -f "${package}.sig" ]; then
+		if [[ -f "${package}.sig" ]]; then
 			msg2 "Package signature found, verifying..."
 
 			# Verify that the signature is correct, else remove for re-signing
@@ -95,7 +95,7 @@ sign_packages() {
 			fi
 		fi
 
-		if ! [ -f "${package}.sig" ]; then
+		if ! [[ -f "${package}.sig" ]]; then
 			create_signature "$package" || return 2
 		fi
 	done