Release version 965 generated by do-release.sh

[citadel.git] / do-release.sh

diff --git a/do-release.sh b/do-release.sh
index a1c608891ebad12ce8737bf70bf93905ab8225a3..72d408a8c7fecdf9001b6b1f2656669bab2b25c6 100755 (executable)
--- a/do-release.sh
+++ b/do-release.sh
@@ -11,7 +11,7 @@ echo -e '╚══════════════════════
 echo -e '\033[0m'
 
 libcitadel_version=`grep LIBCITADEL_VERSION_NUMBER  libcitadel/lib/libcitadel.h | sed s/"[^0-9.]"/""/g`
-citserver_version=`grep REV_LEVEL citadel/citadel.h | sed s/"[^0-9.]"/""/g`
+citserver_version=`grep REV_LEVEL citadel/server/citadel.h | sed s/"[^0-9.]"/""/g`
 webcit_version=`grep CLIENT_VERSION webcit/webcit.h | sed s/"[^0-9.]"/""/g`
 textclient_version=`grep CLIENT_VERSION textclient/textclient.h | sed s/"[^0-9.]"/""/g`
 
@@ -45,7 +45,7 @@ sed \
 # Edit citadel.h to make it the new version
 sed \
        -i s/\#define.\*REV_LEVEL.\*${citserver_version}/\#define\ REV_LEVEL\ ${NEW_VERSION}/g \
-       citadel/citadel.h
+       citadel/server/citadel.h
 
 # Edit webcit.h to make it the new version
 sed \
@@ -58,7 +58,7 @@ sed \
        textclient/textclient.h
 
 libcitadel_version=`grep LIBCITADEL_VERSION_NUMBER  libcitadel/lib/libcitadel.h | sed s/"[^0-9.]"/""/g`
-citserver_version=`grep REV_LEVEL citadel/citadel.h | sed s/"[^0-9.]"/""/g`
+citserver_version=`grep REV_LEVEL citadel/server/citadel.h | sed s/"[^0-9.]"/""/g`
 webcit_version=`grep CLIENT_VERSION webcit/webcit.h | sed s/"[^0-9.]"/""/g`
 textclient_version=`grep CLIENT_VERSION textclient/textclient.h | sed s/"[^0-9.]"/""/g`
 
@@ -76,6 +76,14 @@ echo -e ''
 git commit -a -m "Release version ${NEW_VERSION} generated by do-release.sh"
 git tag -a v${NEW_VERSION} -m "Version ${NEW_VERSION} release"
 
+echo -n 'git push...'
+git push
+echo
+
+echo -n 'git push --tags...'
+git push --tags
+echo
+
 echo -e ''
-echo -e '\033[37mFinished.  Remember to \033[7mgit push\033[0m and then \033[7mgit push --tags\033[0m'
+echo -e '\033[37mFinished.\033[0m'
 echo -e ''