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

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-01-04 07:39:28 -0800 (Mon, 04 Jan 2016)
New Revision: 67480

Modified:
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
Log:
fix r67479

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2016-01-04 15:13:37 UTC (rev 67479)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2016-01-04 15:39:28 UTC (rev 67480)
@@ -17,7 +17,7 @@
 export PATH=/c/msys${PLATFORM}/usr/bin:/c/msys${PLATFORM}/mingw${PLATFORM}/bin:/c/osgeo4w${PLATFORM}/bin:${PATH}
 
 function rm_package_7 {
-    for f in `/c/osgeo4w$1/apps/msys/bin/find $PACKAGEDIR/grass*.tar.bz2 -mtime +7 2>/dev/null`; do
+    for f in `find $PACKAGEDIR/grass*.tar.bz2 -mtime +7 2>/dev/null`; do
         rm -rfv $f
     done
 }
@@ -29,7 +29,7 @@
     cd /c/msys${PLATFORM}/$SRC_DIR/$GRASS_DIR
     svn up || (svn cleanup && svn up)
     
-    rm_package_7 $PLATFORM
+    rm_package_7
     curr=`ls -t $PACKAGEDIR/ 2>/dev/null | head -n1 | cut -d'-' -f5 | cut -d'.' -f1`
     if [ $? -eq 0 ]; then
 	num=$(($curr+1))

Modified: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2016-01-04 15:13:37 UTC (rev 67479)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2016-01-04 15:39:28 UTC (rev 67480)
@@ -23,15 +23,6 @@
     PLATFORM_DIR=x86_64
 fi
 
-function rm_7 {
-    POSTFIX=$1
-
-    dir=${HOME}/${PLATFORM_DIR}/grass${POSTFIX}/osgeo4w/package
-    for f in `find $SRC/${p}/grass$1/osgeo4w/grass*.tar.bz2 -mtime +7`; do
-        rm -rfv $f
-    done
-}
-
 function rsync_package {
     POSTFIX=$1
     VERSION=$2
@@ -52,8 +43,6 @@
 	# release
 	cp $dir/grass*-$package*.tar.bz2 ${HOME}/${PLATFORM_DIR}/grass${POSTFIX}/grass-${VERSION}-${PATCH}.tar.bz2
     fi
-
-    rm_7 $POSTFIX
 }
 
 if test -z $2 ; then