[open-ils-commits] r11349 - branches/rel_1_4/Open-ILS/src/support-scripts

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-11-25 16:32:43 -0500 (Tue, 25 Nov 2008)
New Revision: 11349

Modified:
   branches/rel_1_4/Open-ILS/src/support-scripts/eg_db_config.pl
Log:
Backport r11348 from trunk; fix initial database schema creation

Modified: branches/rel_1_4/Open-ILS/src/support-scripts/eg_db_config.pl
===================================================================
--- branches/rel_1_4/Open-ILS/src/support-scripts/eg_db_config.pl	2008-11-25 21:20:15 UTC (rev 11348)
+++ branches/rel_1_4/Open-ILS/src/support-scripts/eg_db_config.pl	2008-11-25 21:32:43 UTC (rev 11349)
@@ -128,11 +128,13 @@
 	my $parser = XML::LibXML->new();
 	my $opensrf_config = $parser->parse_file($config_file);
 
-	$settings->{host} = $opensrf_config->findnodes($host);
-	$settings->{port} = $opensrf_config->findnodes($port);
-	$settings->{db} = $opensrf_config->findnodes($dbname);
-	$settings->{user} = $opensrf_config->findnodes($user);
-	$settings->{pw} = $opensrf_config->findnodes($pw);
+	# If the user passed in settings at the command line,
+	# we don't want to override them
+	$settings->{host} = $settings->{host} || $opensrf_config->findnodes($host);
+	$settings->{port} = $settings->{port} || $opensrf_config->findnodes($port);
+	$settings->{db} = $settings->{db} || $opensrf_config->findnodes($dbname);
+	$settings->{user} = $settings->{user} || $opensrf_config->findnodes($user);
+	$settings->{pw} = $settings->{pw} || $opensrf_config->findnodes($pw);
 }
 
 # Creates the database schema by calling build-db.sh
@@ -140,10 +142,11 @@
 	my $settings = shift;
 
 	chdir(dirname($build_db_sh));
-	system(File::Spec->catfile('.', basename($build_db_sh)) . " " .
+	my $cmd = File::Spec->catfile('.', basename($build_db_sh)) . " " .
 		$settings->{host} ." ".  $settings->{port} ." ". 
 		$settings->{db} ." ".  $settings->{user} ." ". 
-		$settings->{pw});
+		$settings->{pw};
+	system($cmd);
 	chdir($script_dir);
 }