From 0156f05f498d4685dba5dcc815d3092b8c38be01 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sat, 7 May 2005 22:32:03 +0000
Subject: Fixes from Scott Schwartz

---
 bin/web | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'bin/web')

diff --git a/bin/web b/bin/web
index 0aafb76a..cfc0ab9e 100755
--- a/bin/web
+++ b/bin/web
@@ -52,27 +52,22 @@ plumbapple()
 
 plumbunix()
 {
-	case ${BROWSER:-firefox} in
+	case "${BROWSER:=firefox}" in
 	# Other browsers here
 	# ...
 	*opera*)
-		$BROWSER -remote 'openURL('$i',new-page)'
+		$BROWSER -remote 'openURL('"$i"',new-page)'
 		;;
 	*firebird*)
-		$BROWSER -remote 'openURL('$i',new-window)'
+		$BROWSER -remote 'openURL('"$i"',new-window)'
 		;;
 	*firefox*)
-		$BROWSER -remote 'openURL('$i',new-tab)'
-		;;
-	x-)
-		BROWSER=firefox
-		$BROWSER -remote 'openURL('$i',new-tab)'
+		$BROWSER -remote 'openURL('"$i"',new-tab)' ||
+		$BROWSER "$i"
 		;;
 	*mozilla*)
-		$BROWSER -remote 'openURL('$i',new-tab)'
-		;;
-	x-*)
-		$BROWSER -remote 'openURL('$i',new-tab)'
+		$BROWSER -remote 'openURL('"$i"',new-tab)' ||
+		$BROWSER "$i"
 		;;
 	esac
 }
@@ -99,8 +94,11 @@ else
 		if [ -f "$i" ]
 		then
 			p=`pwd`
+			i=`echo $i | sed 's/ /%20/g'`
 			i=`cleanname -d $p $i`
 			i=file://$i
+		else
+			i=`echo $i | tr -d ' '`
 		fi
 		plumb1 $i
 	done
-- 
cgit v1.2.3