diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 77ef3789c8b3..f7496716acba 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -1,81 +1,81 @@
 #!/bin/sh -
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 # Copyright (c) 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 #	@(#)shar.sh	8.1 (Berkeley) 6/6/93
 #
 
 if [ $# -eq 0 ]; then
 	echo 'usage: shar file ...' 1>&2
 	exit 64			# EX_USAGE
 fi
 
 for i
 do
 	if [ ! \( -d $i -o -r $i \) ]; then
 		echo "$i inaccessible or not exist" 1>&2
 		exit 66		# EX_NOINPUT
 	fi
 done
 
 cat << EOF
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 EOF
 
 for i
 do
 	echo "#	$i"
 done
 
 echo "#"
 
 for i
 do
-	if [ -d $i ]; then
-		echo "echo c - $i"
-		echo "mkdir -p $i > /dev/null 2>&1"
+	if [ -d "$i" ]; then
+		echo "echo c - '$i'"
+		echo "mkdir -p '$i' > /dev/null 2>&1"
 	else
-		md5sum=`echo -n $i | md5`
-		echo "echo x - $i"
-		echo "sed 's/^X//' >$i << '$md5sum'"
-		sed 's/^/X/' $i || exit
+		md5sum=`echo -n "$i" | md5`
+		echo "echo x - '$i'"
+		echo "sed 's/^X//' >'$i' << '$md5sum'"
+		sed 's/^/X/' "$i" || exit
 		echo "$md5sum"
 	fi
 done
 echo exit
 echo ""
 
 exit 0