From 187c0d2a52adace669f4a7d8907a30a6e6c005a3 Mon Sep 17 00:00:00 2001
From: Daniel Pavel <daniel.pavel@gmail.com>
Date: Fri, 14 Dec 2012 19:20:15 +0200
Subject: [PATCH] fixes in the shell scripts

---
 bin/hidconsole     |  7 ++++---
 bin/scan-registers |  4 ++--
 bin/solaar         | 10 ++++------
 bin/solaar-cli     |  8 ++++----
 rules.d/install.sh | 10 +++++-----
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/bin/hidconsole b/bin/hidconsole
index f0b5599d..93b08d29 100755
--- a/bin/hidconsole
+++ b/bin/hidconsole
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-Z=`readlink -f "$0"`
-LIB=`readlink -f $(dirname "$Z")/../lib`
-export PYTHONPATH=$LIB
+Z=`dirname "$0"`
+Z=`readlink -f "$Z/.."`
+
+export PYTHONPATH="$Z/lib"
 export PYTHONUNBUFFERED=yes
 
 NICE=`which nice 2>/dev/null`
diff --git a/bin/scan-registers b/bin/scan-registers
index 0bdca288..20aa8410 100755
--- a/bin/scan-registers
+++ b/bin/scan-registers
@@ -14,10 +14,10 @@ for x in $z; do
 	for y in $z; do
 		echo "10 0${1} 81${x}${y} 000000"
 	done
-done | $HC --hidpp | grep -v ' 8F.. ..0[12]' | grep -B 1 '^>> '
+done | "$HC" --hidpp | grep -v ' 8F.. ..0[12]' | grep -B 1 '^>> '
 
 for x in $z; do
 	for y in $z; do
 		echo "10 0${1} 83${x}${y} 000000"
 	done
-done | $HC --hidpp | grep -v ' 8F.. ..0[12]' | grep -B 1 '^>> '
+done | "$HC" --hidpp | grep -v ' 8F.. ..0[12]' | grep -B 1 '^>> '
diff --git a/bin/solaar b/bin/solaar
index 681e48b5..75e3b1f7 100755
--- a/bin/solaar
+++ b/bin/solaar
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-Z=`readlink -f "$0"`
-APP=`readlink -f $(dirname "$Z")/../app`
-LIB=`readlink -f $(dirname "$Z")/../lib`
-SHARE=`readlink -f $(dirname "$Z")/../share`
+Z=`dirname "$0"`
+Z=`readlink -f "$Z/.."`
 
-export PYTHONPATH=$APP:$LIB
-export XDG_DATA_DIRS=${SHARE}_override:$SHARE:$XDG_DATA_DIRS
+export PYTHONPATH="$Z/app:$Z/lib"
+export XDG_DATA_DIRS="$Z/share_override:$Z/share:$XDG_DATA_DIRS"
 
 NICE=`which nice 2>/dev/null`
 PYTHON=${PYTHON:-`which python python2 python3 | head -n 1`}
diff --git a/bin/solaar-cli b/bin/solaar-cli
index a146c0e6..3d572292 100755
--- a/bin/solaar-cli
+++ b/bin/solaar-cli
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-Z=`readlink -f "$0"`
-APP=`readlink -f $(dirname "$Z")/../app`
-LIB=`readlink -f $(dirname "$Z")/../lib`
-export PYTHONPATH=$APP:$LIB
+Z=`dirname "$0"`
+Z=`readlink -f "$Z/.."`
+
+export PYTHONPATH="$Z/app:$Z/lib"
 
 NICE=`which nice 2>/dev/null`
 PYTHON=${PYTHON:-`which python python2 python3 | head -n 1`}
diff --git a/rules.d/install.sh b/rules.d/install.sh
index b72b530e..1620214f 100755
--- a/rules.d/install.sh
+++ b/rules.d/install.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-Z=$(readlink -f "$0")
+Z=`readlink -f "$0"`
 
 RULES_D=/etc/udev/rules.d
 if ! test -d "$RULES_D"; then
@@ -13,20 +13,20 @@ fi
 RULE=99-logitech-unifying-receiver.rules
 
 if test -n "$1"; then
-	SOURCE=$1
+	SOURCE="$1"
 else
-	SOURCE=$(dirname "$Z")/$RULE
+	SOURCE="`dirname "$Z"`/$RULE"
 	if ! id -G -n | grep -q -F plugdev; then
 		GROUP=$(id -g -n)
 		echo "User '$USER' does not belong to the 'plugdev' group, will use group '$GROUP' in the udev rule."
-		TEMP_RULE=${TMPDIR:-/tmp}/$$-$RULE
+		TEMP_RULE="${TMPDIR:-/tmp}/$$-$RULE"
 		cp -f "$SOURCE" "$TEMP_RULE"
 		SOURCE=$TEMP_RULE
 		sed -i -e "s/GROUP=\"plugdev\"/GROUP=\"$GROUP\"/" "$SOURCE"
 	fi
 fi
 
-if test "$(id -u)" != "0"; then
+if test "`id -u`" != "0"; then
 	echo "Switching to root to install the udev rule."
 	test -x /usr/bin/pkexec && exec /usr/bin/pkexec "$Z" "$SOURCE"
 	test -x /usr/bin/sudo && exec /usr/bin/sudo -- "$Z" "$SOURCE"