id-pbuild.sh: clear distro list if distro option is given

[git-tools-moved-to-github.git] / id-release

diff --git a/id-release b/id-release
index 55fd3b7..fd71ce8 100755 (executable)
--- a/id-release
+++ b/id-release
@@ -25,7 +25,7 @@ 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 +47,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
@@ -59,21 +62,23 @@ fi
 
 if $perl; then
   echo "check perl version numbers"
-  find . -name '*.pm' -print0 | xargs -0 egrep -H '\$VERSION.*=.*[0-9]'
+  find . -name '*.pm' -print0 | xargs -0 egrep -H '\$VERSION.*=.*[0-9]' | egrep -v '^\./deb-src/'
 fi
 
 # update debian version file
 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 ""
+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 "git tag v$version"
 echo "git push origin tag v$version"
@@ -85,27 +90,31 @@ fi
 ######################################################################
 echo ""
 echo "# On RedHat or centos, please run the commands"
-echo "sudo date"
+echo "sudo date # ask for password early"
+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 "# if successfully, scp the package to ftp.indexdata.dk (kebab)"
 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 "# on kebab run: sudo su"
+echo "#               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 "\$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 "# if successfully, scp the package to ftp.indexdata.dk (kebab)"
 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 "# on kebab run: sudo su"
+echo "#               cd $HOME/proj/git-tools/update-archive && ./update-archive.sh"
 echo ""