sync-upstream: quote variables

This commit is contained in:
Tim Ruffing 2021-07-12 18:23:18 +02:00
parent 1bb5db3d60
commit 394f49fd1a

View File

@ -22,11 +22,11 @@ if [ "$#" -lt 1 ]; then
fi fi
REMOTE=upstream REMOTE=upstream
REMOTE_BRANCH=$REMOTE/master REMOTE_BRANCH="$REMOTE/master"
# Makes sure you have a remote "upstream" that is up-to-date # Makes sure you have a remote "upstream" that is up-to-date
setup() { setup() {
ret=0 ret=0
git fetch $REMOTE &> /dev/null || ret=$? git fetch "$REMOTE" &> /dev/null || ret="$?"
if [ ${ret} == 0 ]; then if [ ${ret} == 0 ]; then
return return
fi fi
@ -36,13 +36,13 @@ setup() {
[Yy]* ) ;; [Yy]* ) ;;
* ) exit 1;; * ) exit 1;;
esac esac
git remote add $REMOTE git@github.com:bitcoin-core/secp256k1.git &> /dev/null git remote add "$REMOTE" git@github.com:bitcoin-core/secp256k1.git &> /dev/null
git fetch $REMOTE &> /dev/null git fetch "$REMOTE" &> /dev/null
} }
range() { range() {
RANGESTART_COMMIT=$(git merge-base $REMOTE_BRANCH master) RANGESTART_COMMIT=$(git merge-base "$REMOTE_BRANCH" master)
RANGEEND_COMMIT=$(git rev-parse $REMOTE_BRANCH) RANGEEND_COMMIT=$(git rev-parse "$REMOTE_BRANCH")
if [ "$#" = 1 ]; then if [ "$#" = 1 ]; then
RANGEEND_COMMIT=$1 RANGEEND_COMMIT=$1
fi fi
@ -101,7 +101,7 @@ git pull
git checkout -b temp-merge-"$PRNUM" git checkout -b temp-merge-"$PRNUM"
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
FNAME=$BASEDIR/gh-pr-create.sh FNAME="$BASEDIR/gh-pr-create.sh"
cat <<EOT > "$FNAME" cat <<EOT > "$FNAME"
#!/bin/sh #!/bin/sh
gh pr create -t "$TITLE" -b "$BODY" --web gh pr create -t "$TITLE" -b "$BODY" --web