[GRASS-SVN] r34846 - grass-addons/raster/r.pack
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 13 05:03:17 EST 2008
Author: hamish
Date: 2008-12-13 05:03:17 -0500 (Sat, 13 Dec 2008)
New Revision: 34846
Modified:
grass-addons/raster/r.pack/r.pack
grass-addons/raster/r.pack/r.unpack
Log:
fix last bad commit, uppercase opt names
Modified: grass-addons/raster/r.pack/r.pack
===================================================================
--- grass-addons/raster/r.pack/r.pack 2008-12-13 09:34:37 UTC (rev 34845)
+++ grass-addons/raster/r.pack/r.pack 2008-12-13 10:03:17 UTC (rev 34846)
@@ -2,7 +2,7 @@
# r.pack -- pack up a raster map:
# r.out.mat file + support files => gzip
#
-# (c) 2004-2008 GRASS Development Team
+# (c) 2004 GRASS Development Team
# AUTHOR: Hamish Bowman, Otago University, New Zealand
#
# This program is free software under the GNU General Public
@@ -55,56 +55,34 @@
exit 1
fi
+# output map
+r.out.mat input="$GIS_OPT_INPUT" output="$TMP_DIR"/map.mat
-FILELIST=""
-for ELEMENT in cats cell cellhd colr fcell grid3 hist ; do
- if [ -e "$ELEMENT/$GIS_OPT_MAP" ] ; then
- FILELIST="$FILELIST $ELEMENT/$GIS_OPT_MAP"
-# "$ELEMENT/$GIS_OPT_MAP"
+# copy support files
+for SUPPORT in colr hist cats ; do
+ eval `g.findfile element=$SUPPORT file="$GIS_OPT_INPUT"`
+ if [ ! -z "$file" ] ; then
+ cp "$file" "$TMP_DIR"/$SUPPORT
fi
done
-if [ -d "cell_misc/$GIS_OPT_MAP/" ] ; then
- FILELIST="$FILELIST cell_misc/$GIS_OPT_MAP/"
-# "cell_misc/$GIS_OPT_MAP"/*
-fi
-
-##############
-# output map
-#r.out.mat input="$GIS_OPT_input" output="$TMP_DIR"/map.mat
-
-
-# copy support files
-#for SUPPORT in colr hist cats ; do
-# eval `g.findfile element=$SUPPORT file="$GIS_OPT_input"`
-# if [ ! -z "$file" ] ; then
-# cp "$file" "$TMP_DIR"/$SUPPORT
-# fi
-#done
-
-
-
# copy projection info
# (would prefer to use g.proj*, but this way is 5.3 and 5.7 compat)
eval `g.gisenv`
-#cp "$GISDBASE/$LOCATION_NAME/PERMANENT/PROJ_INFO" "$TMP_DIR"/proj_info
+cp "$GISDBASE"/"$LOCATION_NAME"/PERMANENT/PROJ_INFO "$TMP_DIR"/proj_info
-FILELIST="$FILELIST $GISDBASE/$LOCATION_NAME/PERMANENT/PROJ_INFO"
-
# pack it all up
-#OLD_DIR="`pwd`"
-#cd "$TMP_DIR"/
-#tar czf "$OLD_DIR"/"$GIS_OPT_input".pack *
-echo tar czf "$GIS_OPT_input.pack" $FILELIST
+OLD_DIR="`pwd`"
+cd "$TMP_DIR"/
+tar czf "$OLD_DIR"/"$GIS_OPT_INPUT".pack *
# clean up
-#cd "$OLD_DIR"
-#rm -rf "$TMP_DIR"
+cd "$OLD_DIR"
+rm -rf "$TMP_DIR"
-#echo Finished.
-#exit 0
-
+echo Finished.
+exit 0
Modified: grass-addons/raster/r.pack/r.unpack
===================================================================
--- grass-addons/raster/r.pack/r.unpack 2008-12-13 09:34:37 UTC (rev 34845)
+++ grass-addons/raster/r.pack/r.unpack 2008-12-13 10:03:17 UTC (rev 34846)
@@ -50,13 +50,13 @@
MSET_DIR="$GISDBASE/$LOCATION_NAME/$MAPSET"
-if [ ! -e "$GIS_OPT_input" ] ; then
- echo "ERROR: file not found [$GIS_OPT_input]"
+if [ ! -e "$GIS_OPT_INPUT" ] ; then
+ echo "ERROR: file not found [$GIS_OPT_INPUT]"
exit 1
fi
-# remove .pack and path from $GIS_OPT_input
-MAP_NAME="`basename "$GIS_OPT_input" | sed -e 's/\.pack$//'`"
+# remove .pack and path from $GIS_OPT_INPUT
+MAP_NAME="`basename "$GIS_OPT_INPUT" | sed -e 's/\.pack$//'`"
echo "The imported map will be named [$MAP_NAME]."
eval `g.findfile element=cell file="$MAP_NAME"`
@@ -80,9 +80,9 @@
fi
-cp "$GIS_OPT_input" "$TMP_DIR"/
+cp "$GIS_OPT_INPUT" "$TMP_DIR"/
cd "$TMP_DIR"/
-tar xzf "`basename $GIS_OPT_input`"
+tar xzf "`basename $GIS_OPT_INPUT`"
# check projection compatibility in a rather crappy way
More information about the grass-commit
mailing list