update config; cleanup

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/installer/squeeze/eg_squeeze_installer.sh b/installer/squeeze/eg_squeeze_installer.sh
index 929521e..b659786 100755 (executable)
--- a/installer/squeeze/eg_squeeze_installer.sh
+++ b/installer/squeeze/eg_squeeze_installer.sh
@@ -36,8 +36,8 @@ fi;
 
 
 # -----------------------------------------------------------------------
-# force CPAN to load
-cpan foo
+# force CPAN to load by installing something that should already be installed
+cpan Fcntl
 
 # CPAN follow pre-reqs?
 cpan_policy=$(perl -MCPAN::Config -e 'print $CPAN::Config->{prerequisites_policy}');
@@ -48,7 +48,8 @@ if [ $cpan_policy != 'follow' ]; then
 The install will go faster if CPAN is configured to automatically install 
 prerequisites.  You can revert the action later with:
 
-% echo -e "o conf prerequisites_policy ask\n o conf commit" | cpan '
+echo -e "o conf prerequisites_policy ask\n o conf commit" | cpan 
+'
     while true; do
         echo -n 'Automatically install prereqs? [Y/n] ';
         read X;
@@ -155,7 +156,7 @@ chown -R opensrf:opensrf /openils
 cp /openils/conf/srfsh.xml.example /home/opensrf/.srfsh.xml;
 chown opensrf:opensrf /home/opensrf/.srfsh.xml;
 
-echo -e "\n\nPlease enter a password for the evergreen database user.  If you do not want to edit configs, use \"evergreen\"\n"
+echo -e "\n\nPlease enter a password for the evergreen database user.\n  If you do not want to edit configs, use \"evergreen\"\n"
 su - postgres sh -c 'createuser -P -s evergreen;'
 
 # Apply the DB schema
@@ -164,6 +165,7 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl \
     --create-database       \
     --create-schema         \
     --create-offline        \
+    --update-config         \
     --service all           \
     --user evergreen        \
     --password evergreen    \