diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/last-merged-ioq3-revision | 2 | ||||
| -rwxr-xr-x | misc/merge-ioq3-into-trem.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/last-merged-ioq3-revision b/misc/last-merged-ioq3-revision index 3bdaa175..de2d66e3 100644 --- a/misc/last-merged-ioq3-revision +++ b/misc/last-merged-ioq3-revision @@ -1 +1 @@ -693e51c6544f1b903d6a6587c4d9d8bd520d104b +70b165ee336c9fb7086a628bb8e3e9721bcd920b 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." |