diff --git a/docs/source/code.rst b/docs/source/code.rst index 7d7bf11c..8a0be3e3 100644 --- a/docs/source/code.rst +++ b/docs/source/code.rst @@ -98,7 +98,7 @@ look like: doSomething(value); } -Nullptr +nullptr ^^^^^^^ Please do not use ``0`` nor ``Q_NULLPTR``, only use ``nullptr``. diff --git a/scripts/deploy_docs.sh b/scripts/deploy_docs.sh old mode 100644 new mode 100755 index 65c7fbd5..42a38158 --- a/scripts/deploy_docs.sh +++ b/scripts/deploy_docs.sh @@ -2,9 +2,12 @@ cd $(dirname "${BASH_SOURCE[0]}")/.. +cutter_timestamp=$(git show -s --format=%ct) +cutter_commit="$(git show -s --format="%H %s")" + echo "Cloning current cutter.re" -git clone git@github.com:radareorg/cutter.re.git || exit 1 +git clone --depth 1 git@github.com:radareorg/cutter.re.git || exit 1 echo "Updating docs" @@ -14,8 +17,14 @@ cp -a docs/build/html cutter.re/docs || exit 1 echo "Committing new changes" cd cutter.re || exit 1 +docs_timestamp=$(git show -s --format=%ct) +if [ $docs_timestamp -ge $cutter_timestamp ]; then + echo "Last commit on cutter.re is newer than this commit on cutter. Skipping." + exit 0 +fi + git add . || exit 1 git diff --cached --quiet && echo "No changes." && exit 0 -git commit -m "Update docs from radareorg/cutter" +printf "Update docs from radareorg/cutter\n\nOriginal Commit:\n$cutter_commit" | git commit -F - git push origin master || exit 1