X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-release;h=71a45043ed450c2a9422d0df1f0df430f157a313;hb=b86ba20b14afdabae82a1c64cb525000475e199a;hp=7e16687bec65419907bbe03fade94adc6b6b0c69;hpb=14a64053b5419339f286c579f40151f65f5d4823;p=git-tools-moved-to-github.git

diff --git a/id-release b/id-release
index 7e16687..71a4504 100755
--- a/id-release
+++ b/id-release
@@ -1,10 +1,11 @@
 #!/bin/sh
-# Copyright (c) 2011 IndexData ApS. http://indexdata.com
+# Copyright (c) 2011-2015 IndexData ApS. http://indexdata.com
 # Author: Wolfram Schneider
 #
 # id-release - a helper script to build a release & packaging for debian + redhat
 #
 # see http://twiki.indexdata.dk/cgi-bin/twiki/view/ID/IDSoftwareRelease
+# https://twiki.indexdata.com/twiki/bin/view/ID/AdamsReleaseProcedure
 
 # die early
 set -e
@@ -21,11 +22,14 @@ case $1 in
        * ) usage ;;
 esac
 
+echo "See also https://twiki.indexdata.com/twiki/bin/view/ID/AdamsReleaseProcedure"
+echo ""
+
 echo "Did you updated the news log file?"
 for file in Changes News NEWS
 do
   if [ -e $file ]; then
-    ls -l Changes
+    ls -l $file
   fi
 done
 echo ""
@@ -47,6 +51,9 @@ if [ `ls |egrep '\.spec$' | wc -l` -eq 0 ]; then
 else
     spec=`ls |egrep '\.spec$' | head -1`
     package=`perl -ne 's/\s*$//; print if s/^NAME=//' IDMETA`
+    if [ -z "$package" ]; then
+	package=`basename $spec .spec`
+    fi
 fi
 
 # configure new version
@@ -66,17 +73,15 @@ fi
 perl -i.bak -npe "\$. == 1 && s,\(.*?\),($version)," debian/changelog 
 
 # update redhat version file
-perl -i.bak -npe "s,^Version: .*,Version: $version," $spec
-
+perl -i.bak -npe "s,^Version: \d+.*,Version: $version," $spec
 
 
 ######################################################################
+echo "# Please commit the version updates now"
+echo "git commit -a -m'new release v$version'"
 echo ""
-echo "# Please run now"
-echo "git commit -a"
-echo "git push"
+echo "# Please tag now (we will push later to origin)"
 echo "git tag v$version"
-echo "git push origin tag v$version"
 
 if $java; then
     echo "mvn versions:set -DnewVersion=$version-SNAPSHOT" 
@@ -84,30 +89,13 @@ fi
 
 ######################################################################
 echo ""
-echo "# On RedHat or centos, please run the commands"
-echo "sudo date"
-echo "git pull"
-echo "\$HOME/proj/git-tools/id-deb-build/mkdist.sh"
-echo "sudo cp $package-$version.tar.gz /usr/src/redhat/SOURCES/"
-echo "sudo rpmbuild -ba $spec"
-echo "# if successfully, upload"
-echo "\$HOME/proj/git-tools/id-rpm-build/upload-rpms.sh $spec"
-echo ""
-echo "# on kebab run: sudo su; cd \$HOME/proj/git-tools/update-archive; update-yum-archive.sh"
-
-
-######################################################################
-echo ""
-echo "# On debian or ubuntu, please run the commands"
-echo "sudo rm -rf deb-src"
-echo "git pull"
+echo "# On mochi, please run the commands"
 echo "\$HOME/proj/git-tools/id-deb-build/mkdist.sh"
-echo "\$HOME/proj/git-tools/id-deb-build/id-mk-deb-src.sh"
-echo "sudo \$HOME/proj/git-tools/id-deb-build/id-pbuild.sh"
-echo "# if successfully, upload"
+echo "\$HOME/proj/git-tools/id-deb-build/id-pbuild.sh"
 echo "\$HOME/proj/git-tools/id-deb-build/id-pbuild.sh --upload"
 echo ""
-echo "# on kebab run: sudo su; cd $HOME/proj/git-tools/update-archive; update-archive.sh"
-echo ""
 
+echo "# if successfully, don't forget to push to origin"
+echo "git push origin master"
+echo "git push origin tag v$version"