diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
index 2b6315444121c2a27b1cd787703f84ac9a0e3fad..3706ca2e142936d46453029e16a25a3dbb35b11e 100755
--- a/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@ -12,7 +12,8 @@ if [ $# != 3 ]; then
   exit 1;
 fi
 
-export SOURCE_DATE_EPOCH=$(git show --no-patch --format='%ct')
+SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
+export SOURCE_DATE_EPOCH
 
 output=$3
 
@@ -21,7 +22,7 @@ if [ "$1" = "html" ]; then
     base=${output%%.html.in}
 
     if [ "$2" != none ]; then
-      TZ=UTC "$2" -f "$(dirname $0)/nofooter.conf" -d manpage -o "$output" "$input";
+      TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input";
     else
       echo "==================================";
       echo;
@@ -46,8 +47,8 @@ elif [ "$1" = "man" ]; then
       echo "==================================";
       exit 1;
     fi
-    if "$2" -f manpage $input; then
-      mv $base.1 $output;
+    if "$2" -f manpage "$input"; then
+      mv "$base.1" "$output";
     else
       cat<<EOF
 ==================================
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index f99e45e6f25a79483421c7691195df732b10d3fa..61f97a91d4ca34c6fb4c7940ceb08b4e5beec3a6 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -287,7 +287,7 @@ fi
 #############################################################################
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.