From 1b4bf7918b2df498eab36bed95b3479cfceb80e7 Mon Sep 17 00:00:00 2001
From: Daniel Pavel <daniel.pavel@gmail.com>
Date: Sat, 4 May 2013 19:00:14 +0200
Subject: [PATCH] minor fixes in shell scripts

---
 packaging/build_deb.sh  | 6 ++++--
 packaging/build_ppa.sh  | 4 ++--
 tools/clean.sh          | 5 +++++
 tools/scan-registers.sh | 3 +--
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100755 tools/clean.sh

diff --git a/packaging/build_deb.sh b/packaging/build_deb.sh
index da3083b8..d89b3df5 100755
--- a/packaging/build_deb.sh
+++ b/packaging/build_deb.sh
@@ -4,9 +4,10 @@ set -e
 
 if test ! -r "$HOME/.devscripts"; then
 	echo "$HOME/.descripts must exist"
+	exit 1
 fi
 
-cd `dirname "$0"`/..
+cd "$(dirname "$0")/.."
 DEBIAN_FILES="$PWD/packaging/debian"
 DIST="$PWD/dist/${DISTRIBUTION:=debian}"
 
@@ -16,7 +17,8 @@ mkdir -m 0700 -p "$BUILD_DIR"
 python "setup.py" sdist --dist-dir="$BUILD_DIR" --formats=gztar
 
 cd "$BUILD_DIR"
-S=`ls -1 solaar-*.tar.gz`
+S=$(ls -1 solaar-*.tar.gz | head -n 1)
+test -r "$S"
 VERSION=${S#solaar-}
 VERSION=${VERSION%.tar.gz}
 tar xfz "$S"
diff --git a/packaging/build_ppa.sh b/packaging/build_ppa.sh
index f20c7af4..f1068162 100755
--- a/packaging/build_ppa.sh
+++ b/packaging/build_ppa.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-cd `dirname "$0"`/..
+cd "$(dirname "$0")/.."
 
 DISTRIBUTION=ubuntu
 DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
@@ -12,7 +12,7 @@ DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
 DEBIAN_CHANGELOG="$PWD/packaging/debian/changelog"
 PPA_CHANGELOG="$DEBIAN_FILES_EXTRA/changelog"
 
-latest=`head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#'`
+latest="$(head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#')"
 cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG
 $latest
 
diff --git a/tools/clean.sh b/tools/clean.sh
new file mode 100755
index 00000000..a43fa8f3
--- /dev/null
+++ b/tools/clean.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd "$(dirname "$0")/.."
+find . -type f -name '*.py[co]' -delete
+find . -type d -name '__pycache__' -delete
diff --git a/tools/scan-registers.sh b/tools/scan-registers.sh
index 1fe21df7..2b5be461 100755
--- a/tools/scan-registers.sh
+++ b/tools/scan-registers.sh
@@ -5,8 +5,7 @@ if test -z "$1"; then
 	exit 2
 fi
 
-Z=`readlink -f "$0"`
-HC=`dirname "$Z"`/hidconsole
+HC="$(dirname "$(readlink -f "$0")")/hidconsole"
 
 z='0 1 2 3 4 5 6 7 8 9 a b c d e f'