X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=release.sh;h=4dd027779ed03541710a0e3e055f929d23b7d827;hb=e89f39158974e4d68491a8dcd471f6ee70f5b46f;hp=631ff42561f7b527ee80ec659787263c9669ebc6;hpb=b338e25317e51598228ac69b6d817149ce345f15;p=i3%2Fi3
diff --git a/release.sh b/release.sh
index 631ff425..4dd02777 100755
--- a/release.sh
+++ b/release.sh
@@ -1,9 +1,9 @@
#!/bin/zsh
# This script is used to prepare a new release of i3.
-export RELEASE_VERSION="4.10.1"
-export PREVIOUS_VERSION="4.10"
-export RELEASE_BRANCH="next"
+export RELEASE_VERSION="4.10.2"
+export PREVIOUS_VERSION="4.10.1"
+export RELEASE_BRANCH="master"
if [ ! -e "../i3.github.io" ]
then
@@ -135,6 +135,10 @@ debsign -k4AC8EE1D ${TMPDIR}/debian/*.changes
# Section 3: website
################################################################################
+# Ensure we are in the correct branch for copying the docs.
+cd ${TMPDIR}/i3
+git checkout ${RELEASE_BRANCH}
+
cd ${TMPDIR}
git clone --quiet ${STARTDIR}/../i3.github.io
cd i3.github.io
@@ -143,6 +147,7 @@ git add downloads/i3-${RELEASE_VERSION}.tar.bz2*
cp ${TMPDIR}/i3/RELEASE-NOTES-${RELEASE_VERSION} downloads/RELEASE-NOTES-${RELEASE_VERSION}.txt
git add downloads/RELEASE-NOTES-${RELEASE_VERSION}.txt
sed -i "s,
Documentation for i3 v[^<]*
,Documentation for i3 v${RELEASE_VERSION}
,g" docs/index.html
+sed -i "s,Verify you are using i3 ⥠.*,Verify you are using i3 ⥠${RELEASE_VERSION},g" docs/debugging.html
sed -i "s,[^<]*,${RELEASE_VERSION},g" index.html
sed -i "s,The current stable version is .*$,The current stable version is ${RELEASE_VERSION}.,g" downloads/index.html
sed -i "s,,\n \n ${RELEASE_VERSION} | \n i3-${RELEASE_VERSION}.tar.bz2 | \n $(ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g') | \n signature | \n $(date +'%Y-%m-%d') | \n release notes | \n
\n,g" downloads/index.html
@@ -172,6 +177,7 @@ git commit -a -m "update docs for ${RELEASE_VERSION}"
git remote remove origin
git remote add origin git@github.com:i3/i3.github.io.git
+git config --add remote.origin.push "+refs/heads/master:refs/heads/master"
################################################################################
# Section 4: prepare release announcement email
@@ -182,12 +188,14 @@ cat >email.txt <
To: i3-announce@i3.zekjur.net
Subject: i3 v${RELEASE_VERSION} released
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
Hi,
I just released i3 v${RELEASE_VERSION}. Release notes follow:
EOT
-cat ${TMPDIR}/i3/RELEASE-NOTES-${RELEASE_VERSION}.txt >>email.txt
+cat ${TMPDIR}/i3/RELEASE-NOTES-${RELEASE_VERSION} >>email.txt
################################################################################
# Section 5: final push instructions
@@ -199,6 +207,7 @@ echo "When satisfied, run:"
echo " cd ${TMPDIR}/i3"
echo " git checkout next"
echo " vi debian/changelog"
+echo " git commit -a -m \"debian: update changelog\""
echo " git push"
echo ""
echo " cd ${TMPDIR}/i3.github.io"
@@ -208,7 +217,7 @@ echo " cd ${TMPDIR}/debian"
echo " dput *.changes"
echo ""
echo " cd ${TMPDIR}"
-echo " sendmail < email.txt"
+echo " sendmail -t < email.txt"
echo ""
echo "Announce on:"
echo " twitter"