Whitespace / description cleanup

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1983 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/bin/osrf_config.in b/bin/osrf_config.in
index 5002b04..bc4afb6 100644 (file)
--- a/bin/osrf_config.in
+++ b/bin/osrf_config.in
@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2008 Equinox Software, Inc.
 # Kevin Beswick <kevinbeswick00@gmail.com>
+# Copyright (C) 2010 Laurentian University
+# Dan Scott <dscott@laurentian.ca>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14,116 +16,118 @@
 # GNU General Public License for more details.
 #
 
-# Shows configuration options of OSRF
+# Shows configuration options of OpenSRF
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 
 showInstalled() {
-        JAVA=@OSRF_INSTALL_JAVA@
-        PYTHON=@OSRF_INSTALL_PYTHON@
-        if test "$JAVA" = "true"; then
-           echo "OSRF_JAVA"
-        fi
-        if test "$PYTHON" = "true"; then
-           echo "OSRF_PYTHON"
-        fi
+    JAVA=@OSRF_INSTALL_JAVA@
+    PYTHON=@OSRF_INSTALL_PYTHON@
+    if test "$JAVA" = "true"; then
+        echo "OSRF_JAVA"
+    fi
+    if test "$PYTHON" = "true"; then
+        echo "OSRF_PYTHON"
+    fi
 }
 
 showAll() {
-        echo @PACKAGE_STRING@  
-        echo PREFIX=@prefix@
-        echo BINDIR=@bindir@
-        echo LIBDIR=@libdir@
-        echo TMP=@TMP@
-        echo INCLUDEDIR=@includedir@
-        echo SYSCONFDIR=@sysconfdir@
-        echo APXS2=@APXS2@
-        echo APACHE2_HEADERS=@APACHE2_HEADERS@
-        echo APR_HEADERS=@APR_HEADERS@
-        echo LIBXML2_HEADERS=@LIBXML2_HEADERS@
-        echo 
-        echo "Installed modules:"
-        showInstalled;
+    echo @PACKAGE_STRING@
+    echo PREFIX=@prefix@
+    echo BINDIR=@bindir@
+    echo LIBDIR=@libdir@
+    echo TMP=@TMP@
+    echo INCLUDEDIR=@includedir@
+    echo SYSCONFDIR=@sysconfdir@
+    echo APXS2=@APXS2@
+    echo APACHE2_HEADERS=@APACHE2_HEADERS@
+    echo APR_HEADERS=@APR_HEADERS@
+    echo LIBXML2_HEADERS=@LIBXML2_HEADERS@
+    echo
+    echo "Installed modules:"
+    showInstalled;
 }
 
 showHelp() {
-        echo 
-        echo "------------------------------------------------------------"
-        echo " osrf_config                                                "
-        echo " Shows configuration of opensrf                             "
-        echo "------------------------------------------------------------"
-        echo
-        echo "Usage: osrf_config [--option]"
-        echo 
-        echo "Options: "
-        echo
-        echo "--help                  displays help"
-        echo "--version               displays version number of osrf"
-        echo "--installed             displays options that were installed"
-        echo "--prefix                displays prefix"
-        echo "--bindir                displays bindir"
-        echo "--libdir                displays libdir"
-        echo "--tmp                   displays tmp"
-        echo "--includedir            displays includedir"
-        echo "--sysconfdir            displays sysconfdir"
-        echo "--apxs                  displays location of apxs"
-        echo "--apache                displays location of apache2 headers"
-        echo "--apr                   displays location of apr headers"
-        echo "--libxml                displays location of libxml2 headers" 
-        echo
+    echo
+    echo "------------------------------------------------------------"
+    echo " osrf_config                                                "
+    echo " Display the configuration options for this OpenSRF install "
+    echo "------------------------------------------------------------"
+    echo
+    echo "Usage: osrf_config [--option]"
+    echo
+    echo "Options: "
+    echo
+    echo "--help                  displays help"
+    echo "--version               displays version number of OpenSRF"
+    echo "--installed             displays options that were chosen at install time"
+    echo
+    echo "--apache                displays location of Apache headers"
+    echo "--apr                   displays location of Apache portable runtime headers"
+    echo "--apxs                  displays location of Apache extension tool"
+    echo "--bindir                displays location of binary executables"
+    echo "--includedir            displays location of header files"
+    echo "--libdir                displays location of libraries"
+    echo "--libxml                displays location of libxml2 headers"
+    echo "--localstatedir         displays location of state information"
+    echo "--prefix                displays install prefix"
+    echo "--sysconfdir            displays location of configuration files"
+    echo "--tmp                   displays location of temporary files"
+    echo
 }
 
 case "$1" in
-     --installed)
-               showInstalled
-               ;;
-     --cconfig) cconfig;
-               ;;
-     --libxml)
-               echo @LIBXML2_HEADERS@
-               ;;
-     --apr)
-               echo @APR_HEADERS@
-               ;;
-     --apache)
-               echo @APACHE2_HEADERS@
-               ;;
-     --prefix)
-               echo @prefix@
-               ;;
-     --version) 
-               echo @PACKAGE_STRING@
-               ;;
-     --bindir)
-               echo @bindir@
-               ;;
-     --libdir)
-               echo @libdir@
-               ;;
-     --sysconfdir)
-               echo @sysconfdir@
-               ;;
-     --localstatedir)
-               echo @localstatedir@
-               ;;
-     --tmpdir)
-               echo @TMP@
-               ;;
-     --apxs)
-               echo @APXS2@
-               ;;
-     --includedir)
-               echo @includedir@
-               ;;
-     --docdir)
-               echo @docdir@
-               ;;
-     --help)
-               showHelp
-               ;;
-     *)
-               showAll
-               ;;
+    --installed)
+        showInstalled
+        ;;
+    --cconfig) cconfig;
+             ;;
+    --libxml)
+        echo @LIBXML2_HEADERS@
+        ;;
+    --apr)
+        echo @APR_HEADERS@
+        ;;
+    --apache)
+        echo @APACHE2_HEADERS@
+        ;;
+    --prefix)
+        echo @prefix@
+        ;;
+    --version)
+        echo @PACKAGE_STRING@
+        ;;
+    --bindir)
+        echo @bindir@
+        ;;
+    --libdir)
+        echo @libdir@
+        ;;
+    --sysconfdir)
+        echo @sysconfdir@
+        ;;
+    --localstatedir)
+        echo @localstatedir@
+        ;;
+    --tmpdir)
+        echo @TMP@
+        ;;
+    --apxs)
+        echo @APXS2@
+        ;;
+    --includedir)
+        echo @includedir@
+        ;;
+    --docdir)
+        echo @docdir@
+        ;;
+    --help)
+        showHelp
+        ;;
+    *)
+        showAll
+        ;;
 esac