update R-set-version for nicknames, new sample crontab

git-svn-id: https://svn.r-project.org/R-dev-web/trunk@2693 c52295ea-58df-0310-926a-d16021944841

Author: pd

R-crontab.sample

@@ -1,6 +1,10 @@
-PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/texbin:/usr/X11/bin
+PATH=/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/texbin:/usr/X11/bin
 [email protected]
-10 00 * * * $HOME/scripts/R-build-prerelease
-05 00 25 3 * $HOME/scripts/R-create-branch 2.11
-05 00 8 4 * $HOME/scripts/R-set-version '2.11.0 beta'
-05 00 15 4 * $HOME/scripts/R-set-version '2.11.0 RC'
+05 00 * * * $HOME/scripts/R-build-prerelease
+02 00 12  06 * $HOME/scripts/R-set-version '2.15.1 beta' 'Roasted Marshmallows'
+02 00 15  06 * $HOME/scripts/R-set-version '2.15.1 RC'
+00 09 22  06 * $HOME/scripts/R-build-dist 2.15.1
+#02 00 02 03 * $HOME/scripts/R-create-branch 2.15
+#02 00 16 03 * $HOME/scripts/R-set-version '2.15.0 beta'
+#02 00 23 03 * $HOME/scripts/R-set-version '2.15.0 RC'
+#00 09 30 03 * $HOME/scripts/R-build-dist 2.15.0

R-set-version

@@ -1,13 +1,15 @@
 #!/bin/bash -x
-# This script sets the VERSION file and commits it
+# This script sets the VERSION file andi, optionally, the VERSION-NICK
+# and then commits the changes
 # It is run from cron at Feature Freeze and Code Freeze
 LOCALDIR=$HOME
 # -- no changes necessary below this line
 cd $LOCALDIR/r-release-branch
 umask 022
 cd R
 svn up || exit 1
-echo $* > VERSION
+echo $1 > VERSION
+if [ x"$2" != x ]; then echo $2 > VERSION-NICK ; fi
 aclocal -I m4 --force
 autoconf --force
 svn commit -m "go to $*"