releaseversion.sh simplified to handle integer version numbers

diff --git a/releaseversion.sh b/releaseversion.sh
index f3c121070e1055e00735213ded9f9d43ba848f48..74008fca6002b7b93f097f491149de7c421a2039 100755 (executable)
--- a/releaseversion.sh
+++ b/releaseversion.sh
@@ -2,45 +2,45 @@
 
 if test "$1" = '?'; then
 
 
 if test "$1" = '?'; then
 

-    echo 'no help for the lost.'
-    exit
+       echo 'no help for the lost.'
+       exit

 fi
 
 if test "$1" = 'list'; then
 fi
 
 if test "$1" = 'list'; then

-    echo "showing current release version state: "
-    echo "-------- libcitadel: --------"
-    grep AC_INIT libcitadel/configure.in
-    grep 'PACKAGE_VERSION=' libcitadel/configure
-    echo "  - Header version:"
-    grep LIBCITADEL_VERSION_NUMBER libcitadel/lib/libcitadel.h
-    head -n 5 libcitadel/debian/changelog
-    
-    echo "-------- citserver: --------"
-    grep 'PACKAGE_VERSION=' citadel/configure
-    grep '#define REV_LEVEL' citadel/citadel.h
-    grep '#define REV_MIN' citadel/citadel.h
-    grep '#define EXPORT_REV_MIN' citadel/citadel.h
-    grep '#define LIBCITADEL_MIN' citadel/citadel.h
-    head -n 5 citadel/debian/changelog
-
-    echo "-------- textclient: --------"
-    grep 'PACKAGE_VERSION=' textclient/configure
-    head -n 5 textclient/debian/changelog
-
-    echo "-------- webcit: --------"
-    grep 'PACKAGE_VERSION=' webcit/configure
-    grep '#define CLIENT_VERSION' webcit/webcit.h
-    grep '#define MINIMUM_CIT_VERSION' webcit/webcit.h
-    grep '#define LIBCITADEL_MIN' webcit/webcit.h
-    head -n 5 webcit/debian/changelog
-
-    exit
+       echo "showing current release version state: "
+       echo "-------- libcitadel: --------"
+       grep AC_INIT libcitadel/configure.in
+       grep 'PACKAGE_VERSION=' libcitadel/configure
+       echo "  - Header version:"
+       grep LIBCITADEL_VERSION_NUMBER libcitadel/lib/libcitadel.h
+       head -n 5 libcitadel/debian/changelog
+       
+       echo "-------- citserver: --------"
+       grep 'PACKAGE_VERSION=' citadel/configure
+       grep '#define REV_LEVEL' citadel/citadel.h
+       grep '#define REV_MIN' citadel/citadel.h
+       grep '#define EXPORT_REV_MIN' citadel/citadel.h
+       grep '#define LIBCITADEL_MIN' citadel/citadel.h
+       head -n 5 citadel/debian/changelog
+
+       echo "-------- textclient: --------"
+       grep 'PACKAGE_VERSION=' textclient/configure
+       head -n 5 textclient/debian/changelog
+
+       echo "-------- webcit: --------"
+       grep 'PACKAGE_VERSION=' webcit/configure
+       grep '#define CLIENT_VERSION' webcit/webcit.h
+       grep '#define MINIMUM_CIT_VERSION' webcit/webcit.h
+       grep '#define LIBCITADEL_MIN' webcit/webcit.h
+       head -n 5 webcit/debian/changelog
+
+       exit

 fi
 
 
 if test "$1" = "revert"; then 
 fi
 
 
 if test "$1" = "revert"; then 

-    echo "reverting all changes for version files"
-    git checkout \
+       echo "reverting all changes for version files"
+       git checkout \

        libcitadel/lib/libcitadel.h \
        libcitadel/configure.in \
        libcitadel/debian/changelog \
        libcitadel/lib/libcitadel.h \
        libcitadel/configure.in \
        libcitadel/debian/changelog \


@@ -56,16 +56,15 @@ if test "$1" = "revert"; then
        webcit/configure.ac \
        webcit/debian/changelog
 
        webcit/configure.ac \
        webcit/debian/changelog
 

-    exit
+       exit

 fi 
 
 
 fi 
 
 

-PRINT_VERSION=$1
-HEADER_VERSION=$2
+NEW_VERSION=$1

 
 

-if test -z "$PRINT_VERSION" -o -z "$HEADER_VERSION"; then
-    echo "need print version ( 8.xx) and lib version 8xx"
-    exit
+if test -z "$NEW_VERSION" ; then
+       echo Need new version number
+       exit

 fi
 
 export LANG=C
 fi
 
 export LANG=C


@@ -74,14 +73,14 @@ RELEASEDATE=`date -R`
 
 function DebChangeLog()
 {
 
 function DebChangeLog()
 {

-    FILE=$1
-    PROJECT=$2
-    (
-       printf "${PROJECT} (${PRINT_VERSION}-1) stable; urgency=low\n\n  * new release\n\n -- Wilfried Goesgens <w.goesgens@outgesourced.org>  ${RELEASEDATE}\n\n"
+       FILE=$1
+       PROJECT=$2
+       (
+       printf "${PROJECT} (${NEW_VERSION}-1) stable; urgency=low\n\n  * new release\n\n -- Wilfried Goesgens <w.goesgens@outgesourced.org>  ${RELEASEDATE}\n\n"

        cat ${FILE}
        cat ${FILE}

-    ) > /tmp/${PROJECT}_changelog
-    rm -f ${FILE}
-    mv /tmp/${PROJECT}_changelog ${FILE}
+       ) > /tmp/${PROJECT}_changelog
+       rm -f ${FILE}
+       mv /tmp/${PROJECT}_changelog ${FILE}

 }
 
 
 }
 
 


@@ -90,14 +89,14 @@ function DebChangeLog()
 
 DebChangeLog libcitadel/debian/changelog libcitadel
 
 
 DebChangeLog libcitadel/debian/changelog libcitadel
 

-sed  -i -e "s;^#define LIBCITADEL_VERSION_NUMBER.*[0-9][0-9][0-9]\(.*\)$;#define LIBCITADEL_VERSION_NUMBER\t${HEADER_VERSION}\1;g" \
-    libcitadel/lib/libcitadel.h
+sed  -i -e "s;^#define LIBCITADEL_VERSION_NUMBER.*[0-9][0-9][0-9]\(.*\)$;#define LIBCITADEL_VERSION_NUMBER\t${NEW_VERSION}\1;g" \
+       libcitadel/lib/libcitadel.h

 
 

-OLD_LIB_PRINTVERSION=`grep AC_INIT libcitadel/configure.in  |sed "s;.*\(....\), http.*;\1;"`
+OLD_VERSION=`grep AC_INIT libcitadel/configure.in  |sed "s;.*\(....\), http.*;\1;"`

 
 

-sed -i -e "s;${OLD_LIB_PRINTVERSION};${PRINT_VERSION};" \
-    -e "s;^LIBREVISION=[0-9][0-9][0-9]\(.*\)$;LIBREVISION=${HEADER_VERSION}\1;g" \
-    libcitadel/configure.in
+sed -i -e "s;${OLD_VERSION};${NEW_VERSION};" \
+       -e "s;^LIBREVISION=[0-9][0-9][0-9]\(.*\)$;LIBREVISION=${NEW_VERSION}\1;g" \
+       libcitadel/configure.in

 
 
 
 
 
 


@@ -106,13 +105,13 @@ sed -i -e "s;${OLD_LIB_PRINTVERSION};${PRINT_VERSION};" \
 
 DebChangeLog citadel/debian/changelog citadel
 
 
 DebChangeLog citadel/debian/changelog citadel
 

-OLD_PRINTVERSION=`grep AC_INIT citadel/configure.ac  |sed "s;.*\[\(....\)\],.*;\1;"`
+OLD_VERSION=`grep AC_INIT citadel/configure.ac  |sed "s;.*\[\(....\)\],.*;\1;"`

 
 

-sed -i "s;${OLD_PRINTVERSION};${PRINT_VERSION};" citadel/configure.ac
+sed -i "s;${OLD_VERSION};${NEW_VERSION};" citadel/configure.ac

 
 

-sed  -i -e "s;^#define REV_LEVEL.*[0-9][0-9][0-9]\(.*\)$;#define REV_LEVEL\t${HEADER_VERSION}\1;g" \
-    -e "s;^#define LIBCITADEL_MIN.*[0-9][0-9][0-9]\(.*\)$;#define LIBCITADEL_MIN\t${HEADER_VERSION}\1;g" \
-    citadel/citadel.h
+sed  -i -e "s;^#define REV_LEVEL.*[0-9][0-9][0-9]\(.*\)$;#define REV_LEVEL\t${NEW_VERSION}\1;g" \
+       -e "s;^#define LIBCITADEL_MIN.*[0-9][0-9][0-9]\(.*\)$;#define LIBCITADEL_MIN\t${NEW_VERSION}\1;g" \
+       citadel/citadel.h

 
 ################################################################################
 # textclient
 
 ################################################################################
 # textclient


@@ -124,11 +123,11 @@ sed -i "s;${OLD_PRINTVERSION};${PRINT_VERSION};" textclient/configure.ac
 ################################################################################
 # webcit
 DebChangeLog webcit/debian/changelog webcit
 ################################################################################
 # webcit
 DebChangeLog webcit/debian/changelog webcit

-sed -i "s;${OLD_PRINTVERSION};${PRINT_VERSION};" webcit/configure.ac
+sed -i "s;${OLD_VERSION};${NEW_VERSION};" webcit/configure.ac

 
 

-sed  -i -e "s;^#define CLIENT_VERSION.*[0-9][0-9][0-9]\(.*\)$;#define CLIENT_VERSION\t\t${HEADER_VERSION}\1;g" \
-    -e "s;^#define MINIMUM_CIT_VERSION.*[0-9][0-9][0-9]\(.*\)$;#define MINIMUM_CIT_VERSION\t${HEADER_VERSION}\1;g" \
-    -e "s;^#define LIBCITADEL_MIN.*[0-9][0-9][0-9]\(.*\)$;#define LIBCITADEL_MIN\t${HEADER_VERSION}\1;g" \
-    webcit/webcit.h
+sed  -i -e "s;^#define CLIENT_VERSION.*[0-9][0-9][0-9]\(.*\)$;#define CLIENT_VERSION\t\t${NEW_VERSION}\1;g" \
+       -e "s;^#define MINIMUM_CIT_VERSION.*[0-9][0-9][0-9]\(.*\)$;#define MINIMUM_CIT_VERSION\t${NEW_VERSION}\1;g" \
+       -e "s;^#define LIBCITADEL_MIN.*[0-9][0-9][0-9]\(.*\)$;#define LIBCITADEL_MIN\t${NEW_VERSION}\1;g" \
+       webcit/webcit.h