--- orig/shell-tools
+++ mod/shell-tools
@@ -53,7 +53,7 @@
     {
 	local message="$@"
 
-	echo >&2 "$(basename $0): ${message}"
+	echo >&2 "$(basename "$0"): ${message}"
     }
 }
 
@@ -62,7 +62,7 @@
 {
     local message="$@"
 
-    echo >&2 "$(basename $0): Warning: ${message}"
+    echo >&2 "$(basename "$0"): Warning: ${message}"
 }
 
 # Print error message to standard error
@@ -70,7 +70,7 @@
 {
     local message="$@"
 
-    echo >&2 "$(basename $0): Error: ${message}"
+    echo >&2 "$(basename "$0"): Error: ${message}"
 }
 
 # Count number of words in given arguments
@@ -164,7 +164,7 @@
 # Invoke dd(1) filtering out verbose output
 quiet_dd ()
 {
-    local dd_output=$(mktemp -t "$(basename $0)-dd-XXXXXX")
+    local dd_output=$(mktemp -t "$(basename "$0")-dd-XXXXXX")
     local saved_traps=$(trap)
     add_trap "_quiet_dd_cleanup \"${dd_output}\"" EXIT
     dd "$@" status=noxfer > "${dd_output}" 2>&1
