[GRASS-SVN] r50454 - grass-addons/tools/wingrass-packager

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-01-25 12:55:03 -0800 (Wed, 25 Jan 2012)
New Revision: 50454

Modified:
   grass-addons/tools/wingrass-packager/grass_svn_info.sh
Log:
winGRASS support scripts: update also VERSION_NUMBER and GRASS_BASE

Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh	2012-01-25 20:31:47 UTC (rev 50453)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2012-01-25 20:55:03 UTC (rev 50454)
@@ -14,16 +14,19 @@
     read MAJOR <&3 
     read MINOR <&3 
     read PATCH <&3 
+    VERSION=$MAJOR.$MINOR.$PATCH
+    
     if [[ "$PATCH" == *svn* ]] ; then
 	TYPE="Devel"
     else
 	TYPE="Release"
     fi
-    sed "s/SVN_REVISION \"36599\"/SVN_REVISION \"$REV\"/g" $HOME/$2/GRASS-Installer.nsi > tmp1
-    sed "s/BINARY_REVISION \"1\"/BINARY_REVISION \"$NUM\"/g" tmp1 > tmp2
-    sed "s/INSTALLER_TYPE \"Devel\"/INSTALLER_TYPE \"$TYPE\"/g" tmp2 > tmp3
-    rm tmp1 tmp2
-    mv tmp3 $HOME/$2/GRASS-Installer.nsi
+    sed -e "s/SVN_REVISION \"36599\"/SVN_REVISION \"$REV\"/g" \
+	-e "s/BINARY_REVISION \"1\"/BINARY_REVISION \"$NUM\"/g" \
+	-e "s/INSTALLER_TYPE \"Devel\"/INSTALLER_TYPE \"$TYPE\"/g" \
+	-e "s/VERSION_NUMBER \".*\"/VERSION_NUMBER \"$VERSION\"/g" \
+	-e "s/GRASS_BASE \"GRASS .*\"/GRASS_BASE \"GRASS $VERSION\"/g" $HOME/$2/GRASS-Installer.nsi > tmp
+    mv tmp $HOME/$2/GRASS-Installer.nsi
 }
 
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin