[GRASS-SVN] r67026 - grass/branches/releasebranch_7_0/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-06 02:25:31 -0800 (Sun, 06 Dec 2015)
New Revision: 67026

Modified:
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
wingrass: fix postinstall and preremove script names
          (merge r67025 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-06 10:23:55 UTC (rev 67025)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-06 10:25:31 UTC (rev 67026)
@@ -161,9 +161,9 @@
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT#g" \
     mswindows/osgeo4w/env.bat.tmpl >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/env.bat
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
-    mswindows/osgeo4w/postinstall.bat >$OSGEO4W_ROOT_MSYS/etc/postinstall/${GRASS_EXECUTABLE}.bat 
+    mswindows/osgeo4w/postinstall.bat >$OSGEO4W_ROOT_MSYS/etc/postinstall/grass${PACKAGE_NAME}.bat
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
-    mswindows/osgeo4w/preremove.bat >$OSGEO4W_ROOT_MSYS/etc/preremove/${GRASS_EXECUTABLE}.bat 
+    mswindows/osgeo4w/preremove.bat >$OSGEO4W_ROOT_MSYS/etc/preremove/grass${PACKAGE_NAME}.bat 
 
 if [ -n "$PACKAGE" ]; then
     log building vc libraries 
@@ -186,15 +186,15 @@
     
     # bat files - unix2dos
     unix2dos bin/${GRASS_EXECUTABLE}.bat.tmpl
-    unix2dos etc/postinstall/${GRASS_EXECUTABLE}.bat
-    unix2dos etc/preremove/${GRASS_EXECUTABLE}.bat
+    unix2dos etc/postinstall/grass${PACKAGE_NAME}.bat
+    unix2dos etc/preremove/grass${PACKAGE_NAME}.bat
     
     # grass package
     tar -cjf $PDIR/grass$PACKAGE_NAME-$VERSION-$PACKAGE.tar.bz2 \
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
-	etc/postinstall/${GRASS_EXECUTABLE}.bat \
-	etc/preremove/${GRASS_EXECUTABLE}.bat
+	etc/postinstall/grass${PACKAGE_NAME}.bat \
+	etc/preremove/grass${PACKAGE_NAME}.bat
     
     rm bin/${GRASS_EXECUTABLE}.bat.tmpl