diff options
| author | Tim Angus <tim@ngus.net> | 2013-01-13 23:02:00 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-13 23:02:00 +0000 |
| commit | ce095facb60fab0124d4dbed58fa59110c04ce92 (patch) | |
| tree | c0db980d08ad91a1955b89bf29f8b46b55b9b084 /misc/merge-ioq3-into-trem.sh | |
| parent | f3a76008e56fb1858582e020ef4a029126d56389 (diff) | |
Manual update to last merge SHA
Diffstat (limited to 'misc/merge-ioq3-into-trem.sh')
| -rwxr-xr-x | misc/merge-ioq3-into-trem.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/merge-ioq3-into-trem.sh b/misc/merge-ioq3-into-trem.sh index 53f6a1d6..c943a03e 100755 --- a/misc/merge-ioq3-into-trem.sh +++ b/misc/merge-ioq3-into-trem.sh @@ -1,5 +1,5 @@ #! /bin/bash -# TODO Consider rewrite in perl/python to make this a but less crappy +# TODO Consider rewrite in perl/python to make this a bit less crappy DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PATCHES_DIR=${DIR}/patches @@ -56,7 +56,7 @@ then read -p "Confirm resolve? " git am --resolved fi - + if [ "$?" -ne 0 ] then echo "Patch failed to apply." @@ -76,7 +76,7 @@ then echo "Processing ${SHA} ${PATCH}..." cat ${PATCH} | sed -e 's/\([ab]\)\/code\//\1\/src\//g' | \ git am ${EXCLUDE_PARAMETERS} --quiet --3way - + if [ "$?" -ne 0 ] then echo "Patch failed to apply." |