make config now checks for an existing install.conf before falling back on install...
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 25 Jan 2006 19:13:55 +0000 (19:13 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 25 Jan 2006 19:13:55 +0000 (19:13 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@2836 dcc99617-32d9-48b4-a31d-7c20da2025e4

config.sh

index 6c53001..ede808e 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -27,8 +27,12 @@ DEFAULT_CONFIG_FILE="install.conf.default";
 
 function buildConfig {
 
-       if [ -f "$DEFAULT_CONFIG_FILE" ]; then
-               source "$DEFAULT_CONFIG_FILE";
+       if [ -f "$CONFIG_FILE" ]; then
+               source "$CONFIG_FILE";
+       else
+               if [ -f "$DEFAULT_CONFIG_FILE" ]; then
+                       source "$DEFAULT_CONFIG_FILE";
+               fi;
        fi;