SOURCES: iceweasel.sh - cosmetics

[glen]

Author: glen                         Date: Sun Jan 25 11:46:32 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
SOURCES:
   iceweasel.sh (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/iceweasel.sh
diff -u SOURCES/iceweasel.sh:1.7 SOURCES/iceweasel.sh:1.8
--- SOURCES/iceweasel.sh:1.7	Sun Jan 25 12:43:23 2009
+++ SOURCES/iceweasel.sh	Sun Jan 25 12:46:26 2009
@@ -22,14 +22,15 @@
 done
 
 ICEWEASEL="$LIBDIR/iceweasel"
+PWD=${PWD:-$(pwd)}
 
 if [ "$1" == "-remote" ]; then
 	exec $ICEWEASEL "$@"
 else
-	PING=`$ICEWEASEL -remote 'ping()' 2>&1 >/dev/null`
+	PING=$($ICEWEASEL -remote 'ping()' 2>&1 >/dev/null)
 	if [ -n "$PING" ]; then
-		if [ -f "`pwd`/$1" ]; then
-			exec $ICEWEASEL "file://`pwd`/$1"
+		if [ -f "$PWD/$1" ]; then
+			exec $ICEWEASEL "file://$PWD/$1"
 		else
 			exec $ICEWEASEL "$@"
 		fi
@@ -41,13 +42,12 @@
 		elif [ "$1" == "-compose" ]; then
 			exec $ICEWEASEL -remote 'xfeDoCommand(composeMessage)'
 		else
-			if [ -f "`pwd`/$1" ]; then
-				URL="file://`pwd`/$1"
+			if [ -f "$PWD/$1" ]; then
+				URL="file://$PWD/$1"
 			else
 				URL="$1"
 			fi
-			grep browser.tabs.opentabfor.middleclick ~/.iceweasel/*/prefs.js | grep false > /dev/null
-			if [ $? -ne 0 ]; then
+			if grep -q browser.tabs.opentabfor.middleclick.*false ~/.iceweasel/*/prefs.js; then
 				exec $ICEWEASEL -new-tab "$URL"
 			else
 				exec $ICEWEASEL -new-window "$URL"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iceweasel.sh?r1=1.7&r2=1.8&f=u