diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index 84f57d7b..09d7ad85 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -168,7 +168,7 @@ end_rebase() {
   rebase_merge_dir=$(cd upstream && git rev-parse --git-path rebase-merge)
   rebase_apply_dir=$(cd upstream && git rev-parse --git-path rebase-apply)
 
-  if [[ -d "${rebase_merge_dir}" || -d "${rebase_apply_dir}" ]]; then
+  if [ -d "${rebase_merge_dir}" ] || [ -d "${rebase_apply_dir}" ]; then
     echo "rebase still in progress in './upstream'. Please resolve the rebase in"
     echo "'./upstream' and then run 'make \"$1\"' again."
     exit 1
@@ -176,7 +176,7 @@ end_rebase() {
 
   rm patches/*.patch
   cd upstream
-  git format-patch local -o ../patches --no-prefix --zero-commit --no-signature --no-stat
+  git format-patch local -o ../patches --zero-commit --no-signature --no-stat
   cd ..
   rm rebase-in-progress
   apply "$1"