diff options
| author | Michael Soegtrop | 2018-04-08 19:24:48 +0200 |
|---|---|---|
| committer | Michael Soegtrop | 2018-04-08 19:24:48 +0200 |
| commit | 2feb32e1c4329520fa80a3a54f8986d6978ae444 (patch) | |
| tree | e396563770dea06d4d834fa59a22df0449e0f075 /dev/tools/merge-pr.sh | |
| parent | e9c6d4cbc9973e0c46b8022fcc5a794f363d1e86 (diff) | |
| parent | 250502b01340ec6bedace85c6a2d4a4e57a107cf (diff) | |
Merge PR #6809: Improve shell scripts
Diffstat (limited to 'dev/tools/merge-pr.sh')
| -rwxr-xr-x | dev/tools/merge-pr.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh index ecfdfab948..20612eeb85 100755 --- a/dev/tools/merge-pr.sh +++ b/dev/tools/merge-pr.sh @@ -80,8 +80,8 @@ if [ -z "$REMOTE" ]; then exit 1 fi REMOTE_URL=$(git remote get-url "$REMOTE" --push) -if [ "$REMOTE_URL" != "$OFFICIAL_REMOTE_URL" -a \ - "$REMOTE_URL" != "$OFFICIAL_REMOTE_URL.git" ]; then +if [ "$REMOTE_URL" != "$OFFICIAL_REMOTE_URL" ] && \ + [ "$REMOTE_URL" != "$OFFICIAL_REMOTE_URL.git" ]; then error "remote ${BLUE}$REMOTE${RESET} does not point to the official Coq repo" error "that is ${BLUE}$OFFICIAL_REMOTE_URL" error "it points to ${BLUE}$REMOTE_URL${RESET} instead" |