re-enabled disk usage per installation script

git-svn-id: http://svn.osgeo.org/osgeo/livedvd/gisvm/trunk@10211 7da46fd8-bd2a-0410-a152-cf9810cf5b10
guadaltel · Jun 20, 2013 · 2c12ca3 · 2c12ca3
1 parent 37859a5
commit 2c12ca3
Show file tree

Hide file tree

Showing 73 changed files with 531 additions and 119 deletions.
diff --git a/bin/install_52nSOS.sh b/bin/install_52nSOS.sh
@@ -30,8 +30,9 @@
 # Variables
 # -----------------------------------------------------------------------------
 
+SCRIPT="install_52nSOS.sh"
 echo "==============================================================="
-echo "install_52nSOS.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 TMP="/tmp/build_52nSOS"
@@ -346,7 +347,9 @@ chown -v $USER_NAME:$USER_NAME "$USER_HOME/Desktop/52nSOS-stop.desktop"
 #
 # We just crossed the finish line
 #
-echo "[$(date +%M:%S)]                                                         "
-echo "                         52nSOS install finished                         "
-echo "#########################################################################"
+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 "==============================================================="
 
diff --git a/bin/install_52nWPS.sh b/bin/install_52nWPS.sh
@@ -28,9 +28,9 @@
 #
 # Variables
 # -----------------------------------------------------------------------------
-
+SCRIPT="install_52nWPS.sh"
 echo "==============================================================="
-echo "install_52nWPS.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 TMP="/tmp/build_52nWPS"
@@ -249,7 +249,9 @@ chown -v $USER_NAME:$USER_NAME "$USER_HOME/Desktop/52nWPS-stop.desktop"
 #
 # We just crossed the finish line
 #
-echo "[$(date +%M:%S)]                                                         "
-echo "                         52nWPS install finished                         "
-echo "#########################################################################"
+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 "==============================================================="
 
diff --git a/bin/install_52nWSS.sh b/bin/install_52nWSS.sh
@@ -27,9 +27,9 @@
 #
 # Variables
 # -----------------------------------------------------------------------------
-
+SCRIPT="install_52nWSS.sh"
 echo "==============================================================="
-echo "install_52nWSS.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 TMP="/tmp/build_52nWSS"
@@ -251,4 +251,8 @@ chown $USER_NAME:$USER_NAME "$USER_HOME/Desktop/$WSS_DESKTOP_STOPER_NAME"
 #
 # We just crossed the finish line
 #
-echo "52nWSS install finished"
+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 "==============================================================="
diff --git a/bin/install_R.sh b/bin/install_R.sh
@@ -31,8 +31,9 @@
 # =======
 # sudo ./install_PyDep_and_R.sh
 
+SCRIPT="install_R.sh"
 echo "==============================================================="
-echo "install_R.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 if [ -z "$USER_NAME" ] ; then
@@ -128,3 +129,9 @@ cp -f *.pdf /usr/local/lib/R/site-library/spgrass6/doc/
 mkdir -p /usr/local/share/data/vector
 ln -s /usr/local/lib/R/site-library/rgdal/vectors \
    /usr/local/share/data/vector/R
+
+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 "==============================================================="
diff --git a/bin/install_apache2.sh b/bin/install_apache2.sh
@@ -19,9 +19,9 @@
 # Running:
 # =======
 # sudo /etc/init.d/apache2 start
-
+SCRIPT="install_apache2.sh"
 echo "==============================================================="
-echo "install_apache2.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 apt-get install --yes apache2
@@ -36,3 +36,9 @@ adduser "$USER_NAME" www-data
 
 mkdir -p /var/www
 wget -nv http://www.osgeo.org/favicon.ico -O /var/www/favicon.ico
+
+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 "==============================================================="
diff --git a/bin/install_atlasstyler.sh b/bin/install_atlasstyler.sh
@@ -27,8 +27,9 @@
 # =======
 # Any Java 1.6, Sun preferred
 
+SCRIPT="install_atlasstyler.sh"
 echo "==============================================================="
-echo "install_atlasstyler.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 cp ../sources.list.d/geopublishing.list /etc/apt/sources.list.d/
@@ -86,3 +87,9 @@ fi
 EOF
 
 #?or? if [ ! -x /usr/share/atlasstyler/start_Atlasstyler.sh ] ; then
+
+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 "==============================================================="
diff --git a/bin/install_cartaro.sh b/bin/install_cartaro.sh
@@ -26,11 +26,11 @@
 # Needs already installed Geoserver with Version 2.2
 #
 
+SCRIPT="install_cartaro.sh"
 echo "==============================================================="
-echo "starting install_cartaro.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
-
 CARTARO_PASSWORD="geoserver"
 CARTARO_USER="cartaro-admin"
 
@@ -360,3 +360,8 @@ chmod -R g+w "$GEO_PATH/logs"
 chgrp -R users "$GEO_PATH/data_dir"
 chgrp -R users "$GEO_PATH/logs"
 
+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 "==============================================================="
diff --git a/bin/install_deegree.sh b/bin/install_deegree.sh
@@ -38,8 +38,9 @@
 
 ###########################
 
+SCRIPT="install_deegree.sh"
 echo "==============================================================="
-echo "install_deegree.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 TMP="/tmp/build_deegree"
@@ -180,3 +181,9 @@ unzip -q "$TMP"/deegree-workspace-inspire-3.2-pre9.deegree-workspace
 #chown -R $USER_NAME:$USER_NAME "$DEEGREE_WORKSPACE_ROOT"
 chmod g+w "$DEEGREE_WORKSPACE_ROOT" -R
 chgrp users "$DEEGREE_WORKSPACE_ROOT" -R
+
+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 "==============================================================="
diff --git a/bin/install_desktop.sh b/bin/install_desktop.sh
@@ -19,8 +19,9 @@
 # The menu creation and icon sorting has moved to install_icons_and_menus.sh
 #
 
+SCRIPT="install_desktop.sh"
 echo "==============================================================="
-echo "install_desktop.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 # Running:
@@ -272,3 +273,9 @@ EOF
   # apply the changes to the dconf DB
   dconf update
 fi
+
+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 "==============================================================="
diff --git a/bin/install_docs.sh b/bin/install_docs.sh
@@ -22,8 +22,9 @@
 # =======
 # sudo ./install_docs.sh
 
+SCRIPT="install_docs.sh"
 echo "==============================================================="
-echo "install_docs.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 if [ -z "$USER_NAME" ] ; then
@@ -320,3 +321,8 @@ fi
 ln -s /usr/local/share/doc/Getting_Started_with_Ubuntu_12.04.pdf \
   "$USER_HOME/Desktop/Getting Started with Ubuntu.pdf"
 
+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 "==============================================================="
diff --git a/bin/install_edutools.sh b/bin/install_edutools.sh
@@ -20,6 +20,14 @@
 #  eric is a full featured Python IDE written in PyQt.
 #apt-get --assume-yes install eric
 
+SCRIPT="install_edutools.sh"
 echo "==============================================================="
-echo "install_edutools.sh"
+echo "$SCRIPT"
+echo "==============================================================="
+
+
+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 "==============================================================="
diff --git a/bin/install_eoxserver.sh b/bin/install_eoxserver.sh
@@ -21,8 +21,9 @@
 # =======
 # sudo ./install_eoxserver.sh
 
+SCRIPT="install_eoxserver.sh"
 echo "==============================================================="
-echo "install_eoxserver.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 echo "Starting EOxServer installation"
@@ -265,5 +266,8 @@ mkdir -p /usr/local/share/data/raster
 cd /usr/local/share/data/raster
 ln -s "$DATA_DIR"/eoxserver_demonstration/eoxserver_demonstration/data/meris .
 
-
-echo "Finished EOxServer installation"
+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 "==============================================================="
diff --git a/bin/install_geokettle.sh b/bin/install_geokettle.sh
@@ -36,8 +36,9 @@
 # =======
 # sudo ./install_geokettle.sh
 
+SCRIPT="install_geokettle.sh"
 echo "==============================================================="
-echo "install_geokettle.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 TMP="/tmp/build_geokettle"
@@ -118,3 +119,8 @@ 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 "==============================================================="
diff --git a/bin/install_geomajas.sh b/bin/install_geomajas.sh
@@ -13,8 +13,9 @@
 # in the "LICENSE.LGPL.txt" file distributed with this software or at
 # web page "http://www.fsf.org/licenses/lgpl.html".
 
+SCRIPT="install_geomajas.sh"
 echo "==============================================================="
-echo "install_geomajas.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 # =============================================================================
@@ -160,4 +161,8 @@ ln -s /usr/lib/geomajas-1.8.0-bin/webapps/showcase/WEB-INF/classes/org/geomajas/
 # remove local jai libraries to work with ones provided in default-java (fix for #959)
 rm "$GEOMAJAS_HOME"/webapps/showcase/WEB-INF/lib/jai*.jar
 
-
+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 "==============================================================="
diff --git a/bin/install_geomoose.sh b/bin/install_geomoose.sh
@@ -23,8 +23,9 @@
 
 # Requires: Apache2, PHP5, MapServer
 
+SCRIPT="install_geomoose.sh"
 echo "==============================================================="
-echo "install_geomoose.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 apt-get --assume-yes install php5-sqlite
@@ -106,3 +107,8 @@ mkdir -p /usr/local/share/data/vector
 ln -s /usr/local/geomoose/maps/demo \
       /usr/local/share/data/vector/geomoose
 
+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 "==============================================================="
diff --git a/bin/install_geonetwork.sh b/bin/install_geonetwork.sh
@@ -51,8 +51,9 @@
 # =======
 # sudo ./install_geonetwork.sh
 
+SCRIPT="install_geonetwork.sh"
 echo "==============================================================="
-echo "install_geonetwork.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 GEONETWORK_VERSION=2.10.0-0
@@ -173,4 +174,8 @@ done
 #cp GeoNetwork_opensource_v264_Manual.pdf $USER_HOME/Desktop
 #chown $USER_NAME:$USER_NAME $USER_HOME/Desktop/GeoNetwork_opensource_v264_Manual.pdf
 
-
+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 "==============================================================="
diff --git a/bin/install_geopublisher.sh b/bin/install_geopublisher.sh
@@ -26,8 +26,9 @@
 # =======
 # Any Java 1.6, Sun preferred
 
+SCRIPT="install_geopublisher.sh"
 echo "==============================================================="
-echo "install_geopublisher.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 if [ -z "$USER_NAME" ] ; then
@@ -62,3 +63,8 @@ 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 "==============================================================="
diff --git a/bin/install_geoserver.sh b/bin/install_geoserver.sh
@@ -23,8 +23,9 @@
 # Requires: Sun Java {6|7} compatible runtime
 #
 
+SCRIPT="install_geoserver.sh"
 echo "==============================================================="
-echo "install_geoserver.sh"
+echo "$SCRIPT"
 echo "==============================================================="
 
 TMP="/tmp/build_geoserver"
@@ -252,3 +253,8 @@ cp /usr/local/share/gisvm/app-data/geoserver/ne_10m*.sld \
 echo "Cleaning up Jetty JSP cache in /tmp"
 rm -rf /tmp/Jetty*geoserver*
 
+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 "==============================================================="