Rename tools directory to utils (grass7 branch) (#650)

Apply directory naming from grass-code also here (OSGeo/grass#1348): - utils is more common for helper scripts then tools which is too close to modules.
OSGeo · Dec 22, 2021 · e38e185 · e38e185
1 parent 0c6e694
commit e38e185
Show file tree

Hide file tree

Showing 72 changed files with 31 additions and 30 deletions.
diff --git a/src/raster/r.findtheriver/ReadMe-OSX.rtf b/src/raster/r.findtheriver/ReadMe-OSX.rtf
@@ -68,7 +68,7 @@ I haven't tried it with a module that also includes its own library.\
 			(other_src.c)\
 			(other_header.h)\
 	ReadMe.rtf\
-	tools\
+	utils\
 
 \f0\fs28 \
 
@@ -165,4 +165,4 @@ This program is free software under the GNU General Public License (>=v2).\
 {\field{\*\fldinst{HYPERLINK "http://www.kyngchaos.com"}}{\fldrslt 
 \fs28 \cf0 http://www.kyngchaos.com/}}
 \fs28 \
-}
+}
diff --git a/src/raster/r.slope.direction/r_slope_direction_images.sh b/src/raster/r.slope.direction/r_slope_direction_images.sh
@@ -76,7 +76,7 @@ mogrify -trim $output
 # some bounding box problems noticed when opening mogrify result in Gimp
 
 # Optimize for SVN
-../../../../tools/svn-image.sh $output
+../../../../utils/svn-image.sh $output
 done
 
 # Compute slope of the streets for three different step-size (neighborhood)
@@ -103,5 +103,5 @@ mogrify -trim $output
 # some bounding box problems noticed when opening mogrify result in Gimp
 
 # Optimize for SVN
-../../../../tools/svn-image.sh $output
+../../../../utils/svn-image.sh $output
 done
diff --git a/src/tools/mk_isis_menu.sh b/src/tools/mk_isis_menu.sh
@@ -16,7 +16,7 @@
 
 #In $GRASS_HOME/gui/wxpython/gis_set.py it will not be appropriate
 #if os.getenv('ISISROOT'):
-#    os.popen("bash "+os.path.join(globalvar.GUIDIR, "tools", "mk_isis_menu.sh")
+#    os.popen("bash "+os.path.join(globalvar.GUIDIR, "utils", "mk_isis_menu.sh")
 
 #Toolbox
 tbfile="$HOME/.grass7/toolboxes/toolboxes.xml"

diff --git a/tools/addons/README.txt → utils/addons/README.txt b/tools/addons/README.txt → utils/addons/README.txt
@@ -4,7 +4,7 @@
 
 Cronjobs are run on the `grasslxd` container (on Server `osgeo7`).
 For details, see:
-https://github.com/OSGeo/grass-addons/blob/master/tools/cronjobs_osgeo_lxd/README.md
+https://github.com/OSGeo/grass-addons/blob/master/utils/cronjobs_osgeo_lxd/README.md
 
 
 ## Old WORKFLOW

diff --git a/tools/addons/build-xml.py → utils/addons/build-xml.py b/tools/addons/build-xml.py → utils/addons/build-xml.py
diff --git a/tools/addons/compile-addons.sh → utils/addons/compile-addons.sh b/tools/addons/compile-addons.sh → utils/addons/compile-addons.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # updated for new CMS path MN 8/2015
+# updated to new utils/ path MN 12/2021
 
 DIR=$HOME/src
 # XMLDIR=/var/www/grass/grass-cms/addons/
@@ -14,7 +15,7 @@ if [ ! -d "$XMLDIR" ]; then
 fi
 
 build_addons() {
-    cd tools/addons/ 
+    cd utils/addons/ 
     ./compile-xml.sh $XMLDIR
     for version in 6 7 ; do
     	cd /tmp/.grass${version}/addons/

diff --git a/tools/addons/compile-grass.sh → utils/addons/compile-grass.sh b/tools/addons/compile-grass.sh → utils/addons/compile-grass.sh
diff --git a/tools/addons/compile-xml.sh → utils/addons/compile-xml.sh b/tools/addons/compile-xml.sh → utils/addons/compile-xml.sh
diff --git a/tools/addons/compile.sh → utils/addons/compile.sh b/tools/addons/compile.sh → utils/addons/compile.sh
diff --git a/tools/addons/crontab.build → utils/addons/crontab.build b/tools/addons/crontab.build → utils/addons/crontab.build
@@ -1,13 +1,13 @@
 ### Cronjob for Building server
 
 # add jobs here and then run:
-# crontab $HOME/src/grass_addons/tools/addons/crontab.build && crontab -l
+# crontab $HOME/src/grass_addons/utils/addons/crontab.build && crontab -l
 #
 # install dependencies
 # apt install grass-dev make bc
 # apt install python-gdal python-owslib python-psycopg2 python-matplotlib python-scipy
 
-ADDONS=${HOME}/src/grass-addons/tools/addons
+ADDONS=${HOME}/src/grass-addons/utils/addons
 
 0      2    *     *     *   nice ${ADDONS}/compile-grass.sh
 */15   *    *     *     *   nice ${ADDONS}/grass-addons-build.sh

diff --git a/tools/addons/crontab.publish → utils/addons/crontab.publish b/tools/addons/crontab.publish → utils/addons/crontab.publish
@@ -1,8 +1,8 @@
 ### Cronjob for Publishing server (grass.osgeo.org)
 
 # add jobs here and then run:
-# crontab $HOME/src/grass_addons/tools/addons/crontab.publish && crontab -l
+# crontab $HOME/src/grass_addons/utils/addons/crontab.publish && crontab -l
 
-ADDONS=${HOME}/src/grass-addons/tools/addons
+ADDONS=${HOME}/src/grass-addons/utils/addons
 
 */15   *    *     *     *   nice ${ADDONS}/grass-addons-publish.sh
diff --git a/tools/addons/get_page_description.py → utils/addons/get_page_description.py b/tools/addons/get_page_description.py → utils/addons/get_page_description.py
diff --git a/tools/addons/grass-addons-build.sh → utils/addons/grass-addons-build.sh b/tools/addons/grass-addons-build.sh → utils/addons/grass-addons-build.sh
@@ -18,7 +18,7 @@ if [ "$run" == "2" ]; then
     exit 0
 fi
 
-${SRC}/grass-addons/tools/addons/compile-addons.sh "$1"
+${SRC}/grass-addons/utils/addons/compile-addons.sh "$1"
 
 if [ $? != 0 ] ; then
     exit 0
@@ -30,7 +30,7 @@ manuals() {
     for dir in `find . -maxdepth 1 -type d`; do
         if [ -d $dir/docs/html ] ; then
             for f in `pwd`/$dir/docs/html/*.html ; do 
-                ${SRC}/grass-addons/tools/addons/update_manual.py $f https://grass.osgeo.org/grass${1}${2}/manuals `pwd`
+                ${SRC}/grass-addons/utils/addons/update_manual.py $f https://grass.osgeo.org/grass${1}${2}/manuals `pwd`
             done
             cp -r $dir/docs/html/* $HTMLDIR/ 2>/dev/null
         fi

diff --git a/tools/addons/grass-addons-index.sh → utils/addons/grass-addons-index.sh b/tools/addons/grass-addons-index.sh → utils/addons/grass-addons-index.sh
@@ -92,8 +92,8 @@ generate () {
 <body bgcolor=\"#FFFFFF\">
 <h2>GRASS GIS ${major} Addons Manual pages</h2>
 
-<!-- Generated from: /home/martinl/src/grass_addons/tools/addons/ -->
-<!--       See also: https://github.com/OSGeo/grass-addons/blob/master/tools/addons/README.md -->
+<!-- Generated from: /home/martinl/src/grass_addons/utils/addons/ -->
+<!--       See also: https://github.com/OSGeo/grass-addons/blob/master/utils/addons/README.md -->
 
 <table><tr><td>
 <script type=\"text/javascript\" src=\"https://www.openhub.net/p/grass_gis_addons/widgets/project_factoids_stats?format=js\"></script>
@@ -154,7 +154,7 @@ See also log files of compilation:
 
 	module=`echo $currfile | sed 's+\.html$++g'`
 	echo "<li style=\"margin-left: 20px\"><a href=\"$currfile\">$module</a>: " >> index.html
-        ${SRC}/grass-addons/tools/addons/get_page_description.py $currfile >> index.html
+        ${SRC}/grass-addons/utils/addons/get_page_description.py $currfile >> index.html
     done
 
     year=`date +%Y`

diff --git a/tools/addons/grass-addons-publish.sh → utils/addons/grass-addons-publish.sh b/tools/addons/grass-addons-publish.sh → utils/addons/grass-addons-publish.sh
@@ -44,7 +44,7 @@ if [ "$nup" -gt 1 ] || [ "$1" = "f" ] ; then
     process 7 8
     process 6 4 
 
-    ${ADDONS}/tools/addons/grass-addons-index.sh
+    ${ADDONS}/utils/addons/grass-addons-index.sh
 fi
 
 exit 0
diff --git a/tools/addons/test/data/g.almost.empty.html → utils/addons/test/data/g.almost.empty.html b/tools/addons/test/data/g.almost.empty.html → utils/addons/test/data/g.almost.empty.html
diff --git a/tools/addons/test/data/g.broken.example.html → utils/addons/test/data/g.broken.example.html b/tools/addons/test/data/g.broken.example.html → utils/addons/test/data/g.broken.example.html
diff --git a/tools/addons/test/data/g.no.keywords.html → utils/addons/test/data/g.no.keywords.html b/tools/addons/test/data/g.no.keywords.html → utils/addons/test/data/g.no.keywords.html
diff --git a/tools/addons/test/data/r.group.page.html → utils/addons/test/data/r.group.page.html b/tools/addons/test/data/r.group.page.html → utils/addons/test/data/r.group.page.html
diff --git a/...dons/test/data/r.group.page.with.toc.html → ...dons/test/data/r.group.page.with.toc.html b/...dons/test/data/r.group.page.with.toc.html → ...dons/test/data/r.group.page.with.toc.html
diff --git a/.../addons/test/data/r.standard.example.html → .../addons/test/data/r.standard.example.html b/.../addons/test/data/r.standard.example.html → .../addons/test/data/r.standard.example.html
diff --git a/tools/addons/test/data/wxGUI.example.html → utils/addons/test/data/wxGUI.example.html b/tools/addons/test/data/wxGUI.example.html → utils/addons/test/data/wxGUI.example.html
diff --git a/...ddons/test/test_description_extraction.sh → ...ddons/test/test_description_extraction.sh b/...ddons/test/test_description_extraction.sh → ...ddons/test/test_description_extraction.sh
diff --git a/tools/addons/update_manual.py → utils/addons/update_manual.py b/tools/addons/update_manual.py → utils/addons/update_manual.py
diff --git a/tools/check_examples_screenshots_tests.py → utils/check_examples_screenshots_tests.py b/tools/check_examples_screenshots_tests.py → utils/check_examples_screenshots_tests.py
diff --git a/tools/compress_all_png.sh → utils/compress_all_png.sh b/tools/compress_all_png.sh → utils/compress_all_png.sh
diff --git a/tools/create_manuals_sitemap.py → utils/create_manuals_sitemap.py b/tools/create_manuals_sitemap.py → utils/create_manuals_sitemap.py
diff --git a/tools/cronjobs_osgeo_lxd/README.md → utils/cronjobs_osgeo_lxd/README.md b/tools/cronjobs_osgeo_lxd/README.md → utils/cronjobs_osgeo_lxd/README.md
diff --git a/...s/cronjobs_osgeo_lxd/check_addons_urls.sh → ...s/cronjobs_osgeo_lxd/check_addons_urls.sh b/...s/cronjobs_osgeo_lxd/check_addons_urls.sh → ...s/cronjobs_osgeo_lxd/check_addons_urls.sh
diff --git a/.../cronjobs_osgeo_lxd/compile_addons_git.sh → .../cronjobs_osgeo_lxd/compile_addons_git.sh b/.../cronjobs_osgeo_lxd/compile_addons_git.sh → .../cronjobs_osgeo_lxd/compile_addons_git.sh
diff --git a/...on_grass74_releasebranch_74_build_bins.sh → ...on_grass74_releasebranch_74_build_bins.sh b/...on_grass74_releasebranch_74_build_bins.sh → ...on_grass74_releasebranch_74_build_bins.sh
@@ -152,7 +152,7 @@ echo "GRASS $VERSION compilation done"
 # now GRASS is prepared ############################################
 
 #### create module overview (https://trac.osgeo.org/grass/ticket/1203)
-#sh tools/module_synopsis.sh
+#sh utils/module_synopsis.sh
 
 #### generate developer stuff: pygrass docs + gunittest docs
 # generate pyGRASS sphinx manual (in docs/html/libpython/)

diff --git a/..._lxd/cron_grass74_src_relbr74_snapshot.sh → ..._lxd/cron_grass74_src_relbr74_snapshot.sh b/..._lxd/cron_grass74_src_relbr74_snapshot.sh → ..._lxd/cron_grass74_src_relbr74_snapshot.sh
diff --git a/...on_grass76_releasebranch_76_build_bins.sh → ...on_grass76_releasebranch_76_build_bins.sh b/...on_grass76_releasebranch_76_build_bins.sh → ...on_grass76_releasebranch_76_build_bins.sh
@@ -153,7 +153,7 @@ echo "GRASS $VERSION compilation done"
 # now GRASS is prepared ############################################
 
 #### create module overview (https://trac.osgeo.org/grass/ticket/1203)
-#sh tools/module_synopsis.sh
+#sh utils/module_synopsis.sh
 
 #### generate developer stuff: pygrass docs + gunittest docs
 # generate pyGRASS sphinx manual (in docs/html/libpython/)

diff --git a/..._lxd/cron_grass76_src_relbr76_snapshot.sh → ..._lxd/cron_grass76_src_relbr76_snapshot.sh b/..._lxd/cron_grass76_src_relbr76_snapshot.sh → ..._lxd/cron_grass76_src_relbr76_snapshot.sh
diff --git a/...on_grass78_releasebranch_78_build_bins.sh → ...on_grass78_releasebranch_78_build_bins.sh b/...on_grass78_releasebranch_78_build_bins.sh → ...on_grass78_releasebranch_78_build_bins.sh
@@ -156,7 +156,7 @@ echo "GRASS $VERSION compilation done"
 # now GRASS is prepared ############################################
 
 #### create module overview (https://trac.osgeo.org/grass/ticket/1203)
-#sh tools/module_synopsis.sh
+#sh utils/module_synopsis.sh
 
 #### generate developer stuff: pygrass docs + gunittest docs
 # generate pyGRASS sphinx manual (in docs/html/libpython/)
@@ -272,8 +272,8 @@ sh ~/cronjobs/grass-addons-fetch-xml.sh $TARGETMAIN/addons/
 ############################################
 # create sitemaps to expand the hugo sitemap
 
-python3 $HOME/src/grass$GMAJOR-addons/tools/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/ -o
-python3 $HOME/src/grass$GMAJOR-addons/tools/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/addons/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/addons/ -o
+python3 $HOME/src/grass$GMAJOR-addons/utils/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/ -o
+python3 $HOME/src/grass$GMAJOR-addons/utils/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/addons/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/addons/ -o
 
 ############################################
 # cleanup

diff --git a/..._lxd/cron_grass78_src_relbr78_snapshot.sh → ..._lxd/cron_grass78_src_relbr78_snapshot.sh b/..._lxd/cron_grass78_src_relbr78_snapshot.sh → ..._lxd/cron_grass78_src_relbr78_snapshot.sh
diff --git a/..._osgeo_lxd/cron_grass8_HEAD_build_bins.sh → ..._osgeo_lxd/cron_grass8_HEAD_build_bins.sh b/..._osgeo_lxd/cron_grass8_HEAD_build_bins.sh → ..._osgeo_lxd/cron_grass8_HEAD_build_bins.sh
@@ -142,7 +142,7 @@ echo "GRASS $VERSION compilation done"
 # now GRASS is prepared ############################################
 
 #### create module overview (https://trac.osgeo.org/grass/ticket/1203)
-#sh tools/module_synopsis.sh
+#sh utils/module_synopsis.sh
 
 #### generate developer stuff: pygrass docs + gunittest docs
 # generate pyGRASS sphinx manual (in docs/html/libpython/)
@@ -286,8 +286,8 @@ cd $GRASSBUILDDIR
 ############################################
 # create sitemaps to expand the hugo sitemap
 
-python3 $HOME/src/grass$GMAJOR-addons/tools/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/ -o
-# python3 $HOME/src/grass$GMAJOR-addons/tools/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/addons/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/addons/ -o
+python3 $HOME/src/grass$GMAJOR-addons/utils/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/ -o
+# python3 $HOME/src/grass$GMAJOR-addons/utils/create_manuals_sitemap.py --dir=/var/www/code_and_data/grass$GMAJOR$GMINOR/manuals/addons/ --url=https://grass.osgeo.org/grass$GMAJOR$GMINOR/manuals/addons/ -o
 
 ############################################
 # cleanup

diff --git a/...sgeo_lxd/cron_grass8_HEAD_src_snapshot.sh → ...sgeo_lxd/cron_grass8_HEAD_src_snapshot.sh b/...sgeo_lxd/cron_grass8_HEAD_src_snapshot.sh → ...sgeo_lxd/cron_grass8_HEAD_src_snapshot.sh
diff --git a/tools/cronjobs_osgeo_lxd/cron_job_list_grass → utils/cronjobs_osgeo_lxd/cron_job_list_grass b/tools/cronjobs_osgeo_lxd/cron_job_list_grass → utils/cronjobs_osgeo_lxd/cron_job_list_grass
@@ -1,5 +1,5 @@
 # crontab entries
-# see: https://github.com/OSGeo/grass-addons/tree/master/tools/cronjobs_osgeo_lxd
+# see: https://github.com/OSGeo/grass-addons/tree/master/utils/cronjobs_osgeo_lxd/
 
 # add GRASS GIS build jobs here and then run on `grasslxd`server:
 # crontab $HOME/cronjobs/cron_job_list_grass && crontab -l

diff --git a/...ronjobs_osgeo_lxd/get_page_description.py → ...ronjobs_osgeo_lxd/get_page_description.py b/...ronjobs_osgeo_lxd/get_page_description.py → ...ronjobs_osgeo_lxd/get_page_description.py
@@ -2,7 +2,7 @@
 
 # PURPOSE: Extracts page one line descriptions for index.html of GRASS GIS Addons
 #
-# cloned from https://github.com/OSGeo/grass-addons/blob/master/tools/addons/get_page_description.py
+# cloned from https://github.com/OSGeo/grass-addons/blob/master/utils/addons/get_page_description.py
 #
 # AUTHORS: Martin Landa (Bash version)
 #          Vaclav Petras (Python version)

diff --git a/...njobs_osgeo_lxd/grass-addons-fetch-xml.sh → ...njobs_osgeo_lxd/grass-addons-fetch-xml.sh b/...njobs_osgeo_lxd/grass-addons-fetch-xml.sh → ...njobs_osgeo_lxd/grass-addons-fetch-xml.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# cloned from https://github.com/OSGeo/grass-addons/blob/master/tools/addons/grass-addons-publish.sh
+# cloned from https://github.com/OSGeo/grass-addons/blob/master/utils/addons/grass-addons-publish.sh
 #
 # This script copies built addons manual pages from the winGRASS build server
 # To be run on publishing server (grasslxd server)

diff --git a/.../cronjobs_osgeo_lxd/grass-addons-index.sh → .../cronjobs_osgeo_lxd/grass-addons-index.sh b/.../cronjobs_osgeo_lxd/grass-addons-index.sh → .../cronjobs_osgeo_lxd/grass-addons-index.sh
@@ -7,7 +7,7 @@
 # updated for GRASS GIS Addons by Markus Neteler and Martin Landa, 2013
 # updated for new CMS path MN 8/2015
 # display module prefix by ML 8/2015
-# cloned from https://github.com/OSGeo/grass-addons/blob/master/tools/addons/grass-addons-index.sh
+# cloned from https://github.com/OSGeo/grass-addons/blob/master/utils/addons/grass-addons-index.sh
 #   and updated for GRASS GIS 7 only Addons compilation on grasslxd server by Markus Neteler, 6/2020
 
 # Important: keep log links in sync at https://grass.osgeo.org/download/addons/
@@ -112,7 +112,7 @@ generate () {
 <h2>GRASS GIS ${major} Addons Manual pages</h2>
 
 <!-- Generated from: grasslxd (on osgeo7): ~/cronjobs/grass-addons-index.sh -->
-<!--       See also: https://github.com/OSGeo/grass-addons/blob/master/tools/cronjobs_osgeo_lxd/README.md -->
+<!--       See also: https://github.com/OSGeo/grass-addons/blob/master/utils/cronjobs_osgeo_lxd/README.md -->
 
 <table><tr><td>
 <script type=\"text/javascript\" src=\"https://www.openhub.net/p/grass_gis_addons/widgets/project_factoids_stats?format=js\"></script>

diff --git a/...bs_osgeo_lxd/hugo_clean_and_update_job.sh → ...bs_osgeo_lxd/hugo_clean_and_update_job.sh b/...bs_osgeo_lxd/hugo_clean_and_update_job.sh → ...bs_osgeo_lxd/hugo_clean_and_update_job.sh
diff --git a/tools/cronjobs_osgeo_lxd/rsyncd.conf → utils/cronjobs_osgeo_lxd/rsyncd.conf b/tools/cronjobs_osgeo_lxd/rsyncd.conf → utils/cronjobs_osgeo_lxd/rsyncd.conf
diff --git a/tools/cronjobs_osgeo_lxd/rsyncd.motd → utils/cronjobs_osgeo_lxd/rsyncd.motd b/tools/cronjobs_osgeo_lxd/rsyncd.motd → utils/cronjobs_osgeo_lxd/rsyncd.motd
diff --git a/tools/csv_dequote.pl → utils/csv_dequote.pl b/tools/csv_dequote.pl → utils/csv_dequote.pl
diff --git a/tools/log_cpu.sh → utils/log_cpu.sh b/tools/log_cpu.sh → utils/log_cpu.sh
diff --git a/tools/mem_follow.sh → utils/mem_follow.sh b/tools/mem_follow.sh → utils/mem_follow.sh
diff --git a/tools/module_key_list.sh → utils/module_key_list.sh b/tools/module_key_list.sh → utils/module_key_list.sh
diff --git a/tools/module_svn_propset.sh → utils/module_svn_propset.sh b/tools/module_svn_propset.sh → utils/module_svn_propset.sh
diff --git a/tools/rfc4_dates_calculator.sh → utils/rfc4_dates_calculator.sh b/tools/rfc4_dates_calculator.sh → utils/rfc4_dates_calculator.sh
diff --git a/tools/savanna/.project → utils/savanna/.project b/tools/savanna/.project → utils/savanna/.project
diff --git a/tools/savanna/README → utils/savanna/README b/tools/savanna/README → utils/savanna/README
diff --git a/tools/savanna/savanna.sh → utils/savanna/savanna.sh b/tools/savanna/savanna.sh → utils/savanna/savanna.sh
diff --git a/tools/savanna/savanna_copy_grass.sh → utils/savanna/savanna_copy_grass.sh b/tools/savanna/savanna_copy_grass.sh → utils/savanna/savanna_copy_grass.sh
diff --git a/tools/savanna/savanna_copy_job.sh → utils/savanna/savanna_copy_job.sh b/tools/savanna/savanna_copy_job.sh → utils/savanna/savanna_copy_job.sh
diff --git a/tools/savanna/savanna_global_parameters.sh → utils/savanna/savanna_global_parameters.sh b/tools/savanna/savanna_global_parameters.sh → utils/savanna/savanna_global_parameters.sh
diff --git a/tools/savanna/savanna_init_grass.sh → utils/savanna/savanna_init_grass.sh b/tools/savanna/savanna_init_grass.sh → utils/savanna/savanna_init_grass.sh
diff --git a/tools/savanna/savanna_init_job.sh → utils/savanna/savanna_init_job.sh b/tools/savanna/savanna_init_job.sh → utils/savanna/savanna_init_job.sh
diff --git a/tools/savanna/savanna_mosaic_grass.sh → utils/savanna/savanna_mosaic_grass.sh b/tools/savanna/savanna_mosaic_grass.sh → utils/savanna/savanna_mosaic_grass.sh
diff --git a/tools/savanna/savanna_mosaic_job.sh → utils/savanna/savanna_mosaic_job.sh b/tools/savanna/savanna_mosaic_job.sh → utils/savanna/savanna_mosaic_job.sh
diff --git a/tools/savanna/savanna_parameters_sample.sh → utils/savanna/savanna_parameters_sample.sh b/tools/savanna/savanna_parameters_sample.sh → utils/savanna/savanna_parameters_sample.sh
diff --git a/tools/savanna/savanna_tiling_grass.sh → utils/savanna/savanna_tiling_grass.sh b/tools/savanna/savanna_tiling_grass.sh → utils/savanna/savanna_tiling_grass.sh
diff --git a/tools/savanna/savanna_tiling_job.sh → utils/savanna/savanna_tiling_job.sh b/tools/savanna/savanna_tiling_job.sh → utils/savanna/savanna_tiling_job.sh
diff --git a/tools/std_dataset_display.py → utils/std_dataset_display.py b/tools/std_dataset_display.py → utils/std_dataset_display.py
diff --git a/tools/svn-image.sh → utils/svn-image.sh b/tools/svn-image.sh → utils/svn-image.sh
diff --git a/tools/svn-rm.sh → utils/svn-rm.sh b/tools/svn-rm.sh → utils/svn-rm.sh
diff --git a/tools/svngrep → utils/svngrep b/tools/svngrep → utils/svngrep
diff --git a/tools/svnlog.sh → utils/svnlog.sh b/tools/svnlog.sh → utils/svnlog.sh
diff --git a/tools/transifex_merge.sh → utils/transifex_merge.sh b/tools/transifex_merge.sh → utils/transifex_merge.sh
diff --git a/tools/wiki/install-wiki-ext.sh → utils/wiki/install-wiki-ext.sh b/tools/wiki/install-wiki-ext.sh → utils/wiki/install-wiki-ext.sh
diff --git a/tools/wiki/update-wiki.sh → utils/wiki/update-wiki.sh b/tools/wiki/update-wiki.sh → utils/wiki/update-wiki.sh