more diskspace_probe conversions, boilerplate homogenization, and quo…

…ting git-svn-id: http://svn.osgeo.org/osgeo/livedvd/gisvm/trunk@10488 7da46fd8-bd2a-0410-a152-cf9810cf5b10
guadaltel · Jul 27, 2013 · 457eccf · 457eccf
1 parent 077448a
commit 457eccf
Show file tree

Hide file tree

Showing 11 changed files with 207 additions and 247 deletions.
diff --git a/bin/install_beta.sh b/bin/install_beta.sh
@@ -35,8 +35,8 @@
 echo "--------------------------------------------------------------------"
 echo "Starting installation of beta software..."
 echo "--------------------------------------------------------------------"
-echo Disk Usage1:, main.sh, `df | grep "Filesystem" | sed -e "s/  */,/g"`, date
-echo Disk Usage2:, main.sh, `df | grep " /$" | sed -e "s/  */,/g"`, `date`
+echo Disk Usage1: main.sh, `df | grep "Filesystem" | sed -e "s/  */,/g"`, date
+echo Disk Usage2: main.sh, `df | grep " /$" | sed -e "s/  */,/g"`, `date`
 
 cd beta_software
 
@@ -53,8 +53,8 @@ for SCRIPT in \
   echo Finished: $SCRIPT
   echo
   # Prints in MB blocks now, -h might miss changes less than 1GB
-  echo Disk Usage1:, $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/  */,/g"`, date
-  echo Disk Usage2:, $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/  */,/g"`, `date`
+  echo Disk Usage1: $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/  */,/g"`, date
+  echo Disk Usage2: $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/  */,/g"`, `date`
 done
 
 exit 0

diff --git a/bin/install_geokettle.sh b/bin/install_geokettle.sh
@@ -7,10 +7,8 @@
 #          Based on uDig install script by
 #          Stefan Hansen.
 #
-#################################################
 # Copyright (c) 2009-2011 Spatialytics, (c) 2007-2009 GeoSOA Research group
-#
-# Licensed under the GNU LGPL.
+# Licensed under the GNU LGPL version >= 2.1.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published
@@ -22,36 +20,33 @@
 # in the "LICENSE.LGPL.txt" file distributed with this software or at
 # web page "http://www.fsf.org/licenses/lgpl.html".
 #
-
 # About:
 # =====
 # This script will install GeoKettle into Ubuntu
-
+#
 # Java requirements
 # =================
 # GeoKettle can run on either version 5 or 6 of the Sun Java JRE.
-# There's no preference for Java 5 or 6 with the current version (one or the other will do fine), but future versions may rely on features only present in >= 6.
+# There's no preference for Java 5 or 6 with the current version (one or the
+#  other will do fine), but future versions may rely on features only present
+#  in >= 6.
 
-# Running:
-# =======
-# sudo ./install_geokettle.sh
+./diskspace_probe.sh "`basename $0`" begin
+BUILD_DIR=`pwd`
+####
 
-SCRIPT="install_geokettle.sh"
-echo "==============================================================="
-echo "$SCRIPT"
-echo "==============================================================="
+
+if [ -z "$USER_NAME" ] ; then
+   USER_NAME="user"
+fi
+USER_HOME="/home/$USER_NAME"
 
 TMP="/tmp/build_geokettle"
 GEOKETTLE_URL="http://spatialytics.fetchapp.com/files/udelaj"
 GEOKETTLE_BASENAME="geokettle-2.5"
 GEOKETTLE_FILENAME="$GEOKETTLE_BASENAME.zip"
 INSTALL_FOLDER="/opt"
 GEOKETTLE_FOLDER="$INSTALL_FOLDER/geokettle"
-BIN="/usr/bin"
-if [ -z "$USER_NAME" ] ; then
-   USER_NAME="user"
-fi
-USER_HOME="/home/$USER_NAME"
 #DESKTOP="Bureau"
 DESKTOP="Desktop"
 
@@ -70,11 +65,10 @@ cd "$TMP"
 ## Install Application ##
 
 # get geokettle
-if [ -f "$GEOKETTLE_FILENAME" ]
-then
+if [ -f "$GEOKETTLE_FILENAME" ] ; then
    echo "$GEOKETTLE_FILENAME has already been downloaded."
 else
-   wget --progress=dot:mega "$GEOKETTLE_URL" -O $GEOKETTLE_FILENAME
+   wget --progress=dot:mega "$GEOKETTLE_URL" -O "$GEOKETTLE_FILENAME"
 fi
 # unpack it
 unzip -q "$GEOKETTLE_FILENAME" -d "$TMP/$GEOKETTLE_BASENAME"
@@ -119,8 +113,6 @@ mkdir -p /usr/local/share/data/vector
 ln -s /opt/geokettle/samples/transformations/geokettle/files \
       /usr/local/share/data/vector/geokettle
 
-echo "==============================================================="
-echo "Finished $SCRIPT"
-echo Disk Usage1:, $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/  */,/g"`, date
-echo Disk Usage2:, $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/  */,/g"`, `date`
-echo "==============================================================="
+
+####
+"$BUILD_DIR"/diskspace_probe.sh "`basename $0`" end
diff --git a/bin/install_geopublisher.sh b/bin/install_geopublisher.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
+#
 # Copyright (c) 2010 The Open Source Geospatial Foundation.
-# Licensed under the GNU LGPL.
+# Licensed under the GNU LGPL version >= 2.1.
+# Author: Stefan A. Tzeggai
 #
 # This library is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published
@@ -11,25 +13,17 @@
 # See the GNU Lesser General Public License for more details, either
 # in the "LICENSE.LGPL.txt" file distributed with this software or at
 # web page "http://www.fsf.org/licenses/lgpl.html".
-
-# Author: Stefan A. Tzeggai
-
+#
 # About:
 # =====
 # This script will install geopublisher via a Debian Repository .deb
-
-# Running:
-# =======
-# "geopublisher" from Application -> Science -> Geopublisher
-
+#
 # Requirements:
 # =======
 # Any Java 1.6, Sun preferred
 
-SCRIPT="install_geopublisher.sh"
-echo "==============================================================="
-echo "$SCRIPT"
-echo "==============================================================="
+./diskspace_probe.sh "`basename $0`" begin
+####
 
 if [ -z "$USER_NAME" ] ; then
    USER_NAME="user"
@@ -45,7 +39,8 @@ apt-get -q update
 # Install Geopublisher and documentation
 apt-get -q install --yes --no-install-recommends geopublisher geopublishing-doc
 
-# Now we create a .properties file which predefines that Geopublisher open-file-dialog will start in the directory recommended in the quickstart 
+# Now we create a .properties file which predefines that Geopublisher
+#  open-file-dialog will start in the directory recommended in the quickstart 
 mkdir -p "$USER_HOME/.Geopublisher"
 echo "LastOpenAtlasFolder=$USER_HOME/Desktop/ChartDemoAtlas" \
    > "$USER_HOME/.Geopublisher/geopublisher.properties"
@@ -63,8 +58,6 @@ mkdir -p /usr/local/share/data/vector
 ln -s /usr/share/doc/geopublishing-doc/tutorial_Geopublisher_1 \
       /usr/local/share/data/vector/geopublisher
 
-echo "==============================================================="
-echo "Finished $SCRIPT"
-echo Disk Usage1:, $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/  */,/g"`, date
-echo Disk Usage2:, $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/  */,/g"`, `date`
-echo "==============================================================="
+
+####
+./diskspace_probe.sh "`basename $0`" end
diff --git a/bin/install_mapbender.sh b/bin/install_mapbender.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (c) 2009 The Open Source Geospatial Foundation.
-# Licensed under the GNU LGPL.
+# Licensed under the GNU LGPL version >= 2.1.
 # 
 # This library is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published
@@ -11,33 +11,29 @@
 # See the GNU Lesser General Public License for more details, either
 # in the "LICENSE.LGPL.txt" file distributed with this software or at
 # web page "http://www.fsf.org/licenses/lgpl.html".
-
-
+#
 # About:
 # =====
 # This script will install mapbender and will create a database mapbender in PostgreSQL with PostGIS. 
 # The script will also add an ALIAS for Mapbender and an ALIAS for Mapbender owsproxy
-
-# Running:
-# =======
-# sudo ./install_mapbender.sh
-
+#
 # Requires: Apache2, PHP5, postgresql/postgis
 #
 # Uninstall:
 # ============
 # sudo rm -rf /var/www/mapbender
 
-SCRIPT="install_mapbender.sh"
-echo "==============================================================="
-echo "$SCRIPT"
-echo "==============================================================="
+./diskspace_probe.sh "`basename $0`" begin
+BUILD_DIR=`pwd`
+####
+
 
 # live disc's username is "user"
 if [ -z "$USER_NAME" ] ; then
    USER_NAME="user"
 fi
 USER_HOME="/home/$USER_NAME"
+
 TMP_DIR="/tmp/build_mapbender"
 INSTALLURL="http://www.mapbender.org/download"
 INSTALLFILE="mapbender2.7_osgeolive6.0"
@@ -170,8 +166,6 @@ fi
 cp /usr/share/applications/mapbender.desktop "$USER_HOME/Desktop/"
 chown "$USER_NAME.$USER_NAME" "$USER_HOME/Desktop/mapbender.desktop"
 
-echo "==============================================================="
-echo "Finished $SCRIPT"
-echo Disk Usage1:, $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/  */,/g"`, date
-echo Disk Usage2:, $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/  */,/g"`, `date`
-echo "==============================================================="
+
+####
+"$BUILD_DIR"/diskspace_probe.sh "`basename $0`" end
diff --git a/bin/install_mapbender3.sh b/bin/install_mapbender3.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (c) 2009 The Open Source Geospatial Foundation.
-# Licensed under the GNU LGPL.
+# Licensed under the GNU LGPL version >= 2.1.
 # 
 # This library is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published
@@ -11,36 +11,32 @@
 # See the GNU Lesser General Public License for more details, either
 # in the "LICENSE.LGPL.txt" file distributed with this software or at
 # web page "http://www.fsf.org/licenses/lgpl.html".
-
-
+#
 # About:
 # =====
-# This script will install mapbender3 and will create a PostgreSQL database mapbender3.0.0.0. 
+# This script will install mapbender3 and will create a PostgreSQL database
+#  mapbender3.0.0.0. 
 # The script will also add an ALIAS for Mapbender3 and a Desktop icon.
-
-# Running:
-# =======
-# sudo ./install_mapbender3.sh
-
+#
 # Requires: Apache2, PHP5, PostgreSQL
 #
 # Uninstall:
 # ============
 # sudo rm -rf /var/www/mapbender3
 
-SCRIPT="install_mapbender3.sh"
-echo "==============================================================="
-echo "$SCRIPT"
-echo "==============================================================="
+./diskspace_probe.sh "`basename $0`" begin
+BUILD_DIR=`pwd`
+####
+
 
 # live disc's username is "user"
 if [ -z "$USER_NAME" ] ; then
    USER_NAME="user"
 fi
 USER_HOME="/home/$USER_NAME"
+
 TMP_DIR="/tmp/build_mapbender3"
 INSTALLURL="http://mapbender3.org/builds/"
-
 INSTALLFILE="mapbender3-3.0.0.2"
 INSTALL_DIR="/var/www"
 
@@ -157,8 +153,6 @@ fi
 cp /usr/local/share/applications/mapbender3.desktop "$USER_HOME/Desktop/"
 chown "$USER_NAME.$USER_NAME" "$USER_HOME/Desktop/mapbender3.desktop"
 
-echo "==============================================================="
-echo "Finished $SCRIPT"
-echo Disk Usage1:, $SCRIPT, `df . -B 1M | grep "Filesystem" | sed -e "s/  */,/g"`, date
-echo Disk Usage2:, $SCRIPT, `df . -B 1M | grep " /$" | sed -e "s/  */,/g"`, `date`
-echo "==============================================================="
+
+####
+"$BUILD_DIR"/diskspace_probe.sh "`basename $0`" end