From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 5 Nov 2018 18:32:29 +0000 (+0100)
Subject: release.sh: save docs first
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F3505%2Fhead;p=i3%2Fi3

release.sh: save docs first

Otherwise, as @orestisf1993 pointed out, the saved documentation will have the
wrong version number.
---

diff --git a/release.sh b/release.sh
index 4a920ccc..97d91868 100755
--- a/release.sh
+++ b/release.sh
@@ -155,6 +155,12 @@ git checkout ${RELEASE_BRANCH}
 cd ${TMPDIR}
 git clone --quiet ${STARTDIR}/../i3.github.io
 cd i3.github.io
+
+mkdir docs/${PREVIOUS_VERSION}
+tar cf - '--exclude=[0-9]\.[0-9e]*' docs | tar xf - --strip-components=1 -C docs/${PREVIOUS_VERSION}
+git add docs/${PREVIOUS_VERSION}
+git commit -a -m "save docs for ${PREVIOUS_VERSION}"
+
 cp ${TMPDIR}/i3/i3-${RELEASE_VERSION}.tar.bz2* downloads/
 git add downloads/i3-${RELEASE_VERSION}.tar.bz2*
 cp ${TMPDIR}/i3/RELEASE-NOTES-${RELEASE_VERSION} downloads/RELEASE-NOTES-${RELEASE_VERSION}.txt
@@ -166,11 +172,6 @@ sed -i "s,<tbody>,<tbody>\n  <tr>\n    <td>${RELEASE_VERSION}</td>\n    <td><a h
 
 git commit -a -m "add ${RELEASE_VERSION} release"
 
-mkdir docs/${PREVIOUS_VERSION}
-tar cf - '--exclude=[0-9]\.[0-9e]*' docs | tar xf - --strip-components=1 -C docs/${PREVIOUS_VERSION}
-git add docs/${PREVIOUS_VERSION}
-git commit -a -m "save docs for ${PREVIOUS_VERSION}"
-
 for i in $(find _docs -maxdepth 1 -and -type f -and \! -regex ".*\.\(html\|man\)$" -and \! -name "Makefile")
 do
 	base="$(basename $i)"