diff --git a/git-cache b/git-cache
index 6b1a88a79..d633e4209 100755
--- a/git-cache
+++ b/git-cache
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-drover b/git-drover
index 817b6b8dc..02b9138f3 100755
--- a/git-drover
+++ b/git-drover
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-find-releases b/git-find-releases
index 6b1a88a79..d633e4209 100755
--- a/git-find-releases
+++ b/git-find-releases
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-footers b/git-footers
index 6b1a88a79..d633e4209 100755
--- a/git-footers
+++ b/git-footers
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-freeze b/git-freeze
index ffba0cbe7..7398c5f19 100755
--- a/git-freeze
+++ b/git-freeze
@@ -5,4 +5,4 @@
 
 SCRIPT=git_freezer.py
 set -- freeze "$@"
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-hyper-blame b/git-hyper-blame
index 4abb969a8..69ce99db7 100755
--- a/git-hyper-blame
+++ b/git-hyper-blame
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-map b/git-map
index 6b1a88a79..d633e4209 100755
--- a/git-map
+++ b/git-map
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-map-branches b/git-map-branches
index 6b1a88a79..d633e4209 100755
--- a/git-map-branches
+++ b/git-map-branches
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-mark-merge-base b/git-mark-merge-base
index 6b1a88a79..d633e4209 100755
--- a/git-mark-merge-base
+++ b/git-mark-merge-base
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-nav-downstream b/git-nav-downstream
index 6b1a88a79..d633e4209 100755
--- a/git-nav-downstream
+++ b/git-nav-downstream
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-new-branch b/git-new-branch
index 6b1a88a79..d633e4209 100755
--- a/git-new-branch
+++ b/git-new-branch
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-number b/git-number
index 2b9c996d7..d0c30df67 100755
--- a/git-number
+++ b/git-number
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-rebase-update b/git-rebase-update
index 6b1a88a79..d633e4209 100755
--- a/git-rebase-update
+++ b/git-rebase-update
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-rename-branch b/git-rename-branch
index 6b1a88a79..d633e4209 100755
--- a/git-rename-branch
+++ b/git-rename-branch
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-reparent-branch b/git-reparent-branch
index 6b1a88a79..d633e4209 100755
--- a/git-reparent-branch
+++ b/git-reparent-branch
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-retry b/git-retry
index 014743a6a..ac201c6bd 100755
--- a/git-retry
+++ b/git-retry
@@ -5,4 +5,4 @@
 
 SCRIPT=git_retry.py
 set -- retry "$@"
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-squash-branch b/git-squash-branch
index 6b1a88a79..d633e4209 100755
--- a/git-squash-branch
+++ b/git-squash-branch
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-thaw b/git-thaw
index 8f6a4e364..2e0c4865a 100755
--- a/git-thaw
+++ b/git-thaw
@@ -10,4 +10,4 @@
 
 SCRIPT=git_freezer.py
 set -- thaw "$@"
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/git-upstream-diff b/git-upstream-diff
index ba16876d0..08cad36b3 100755
--- a/git-upstream-diff
+++ b/git-upstream-diff
@@ -6,4 +6,4 @@
 # git_upstream_diff.py -- Provide the diff between the current branch and its
 # upstream.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/update_depot_tools b/update_depot_tools
index 20d33738a..417b15d5a 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -119,7 +119,7 @@ function update_git_repo {
 # Update git checkouts.
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
   if [ -e "$base_dir/.git" ]; then
-    cd $base_dir
+    cd "$base_dir"
     update_git_repo
     cd - > /dev/null
   fi