From 6bcb66ccd5af5f654220af7409e7d32bb29fc4c5 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sun, 24 Jul 2005 21:43:15 +0000
Subject: [PATCH] database creation stuff -- untested

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1398 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/Makefile                       |  1 +
 Open-ILS/src/extras/import/build-oils-db.sh |  8 ++++----
 Open-ILS/src/sql/Pg/build-db-Postgres.sh    | 13 -------------
 Open-ILS/src/sql/Pg/build-db.sh             | 16 ++++++++++++++++
 config.sh                                   | 15 ++++++++++++++-
 5 files changed, 35 insertions(+), 18 deletions(-)
 delete mode 100755 Open-ILS/src/sql/Pg/build-db-Postgres.sh
 create mode 100755 Open-ILS/src/sql/Pg/build-db.sh

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 2d02e12841..11db99ea01 100644
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -21,6 +21,7 @@ javascript-install:
 storage-bootstrap:
 	mkdir -p $(CGIDIR)
 	cp -r cgi-bin/* $(CGIDIR)
+	./extras/import/build-oils-db.sh $(DBDRVR) $(DBHOST) $(DBNAME) $(DBUSER) $(DBPW)
 
 web-templates-install:
 	mkdir -p $(TEMPLATEDIR)
diff --git a/Open-ILS/src/extras/import/build-oils-db.sh b/Open-ILS/src/extras/import/build-oils-db.sh
index 844f5b3a03..da58b161a3 100755
--- a/Open-ILS/src/extras/import/build-oils-db.sh
+++ b/Open-ILS/src/extras/import/build-oils-db.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ "_$3" == "_" ]; then
 	echo "Usage:"
-	echo "	$0 {db-user} {Open-ILS-driver} {db-name}"
+	echo "	$0 {Open-ILS-driver} {db-host} {db-name} {db-user} {db-password}"
 	exit 1;
 fi
 
@@ -9,8 +9,8 @@ PWD=`pwd`
 WD=`dirname $0`
 
 (
-	echo "cd $WD/../../sql/$2/;"
-	cd $WD/../../sql/$2/;
+	echo "cd $WD/../../sql/$1/;"
+	cd $WD/../../sql/$1/;
 	pwd
-	./build-db-$2.sh $1 $3 $4
+	./build-db.sh $2 $3 $4 $5
 )
diff --git a/Open-ILS/src/sql/Pg/build-db-Postgres.sh b/Open-ILS/src/sql/Pg/build-db-Postgres.sh
deleted file mode 100755
index 74a63f9072..0000000000
--- a/Open-ILS/src/sql/Pg/build-db-Postgres.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-psql -U $1 -d $2 -f 002.schema.config.sql
-psql -U $1 -d $2 -f 005.schema.actors.sql
-psql -U $1 -d $2 -f 010.schema.biblio.sql
-psql -U $1 -d $2 -f 020.schema.functions.sql
-psql -U $1 -d $2 -f 030.schema.metabib.sql
-psql -U $1 -d $2 -f 040.schema.asset.sql
-psql -U $1 -d $2 -f 080.schema.money.sql
-psql -U $1 -d $2 -f 090.schema.action.sql
-
-psql -U $1 -d $2 -f 800.fkeys.sql
-psql -U $1 -d $2 -f 900.audit-tables.sql
diff --git a/Open-ILS/src/sql/Pg/build-db.sh b/Open-ILS/src/sql/Pg/build-db.sh
new file mode 100755
index 0000000000..54a2b2bec3
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/build-db.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# args: {db-host} {db-name} {db-user} {db-password}
+
+echo "You may be prompted several times for your database password..."
+
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 002.schema.config.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 005.schema.actors.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 010.schema.biblio.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 020.schema.functions.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 030.schema.metabib.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 040.schema.asset.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 080.schema.money.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 090.schema.action.sql
+
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 800.fkeys.sql
+PGUSER=$3 PGHOST=$1 PGDATABASE=$2 psql -f 900.audit-tables.sql
diff --git a/config.sh b/config.sh
index 935cdd531c..ece9789524 100755
--- a/config.sh
+++ b/config.sh
@@ -123,7 +123,7 @@ function prompt { echo ""; echo -n "$*"; }
 function writeConfig {
 
 	rm -f "$CONFIG_FILE";
-	echo "Writing config to $CONFIG_FILE...";
+	echo "Writing installation config to $CONFIG_FILE...";
 
 	_write "PREFIX=\"$PREFIX\"";
 	_write "BINDIR=\"$BINDIR\"";
@@ -156,6 +156,7 @@ function writeConfig {
 	# Now we'll write out the DB bootstrapping config
 	CONFIG_FILE='Open-ILS/src/cgi-bin/setup.pl';
 	rm -f "$CONFIG_FILE";
+	echo "Writing bootstrapping config to $CONFIG_FILE...";
 
 	STR='$main::config{dsn} =';
 		STR="$STR 'dbi:${DBDRVR}:host=";
@@ -174,6 +175,18 @@ function writeConfig {
 	_write '$main::config{index} = "config.html";';
 
 
+	prompt "";
+	prompt "";
+	prompt "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
+	prompt "!! Before running 'make install' you MUST !!";
+	prompt "!! create a database for Open-ILS.  Use   !!";
+	prompt "!! the settings that you listed above and !!";
+	prompt "!! the install scripts will create the    !!";
+	prompt "!! database for you.  -miker              !!";
+	prompt "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
+	prompt "";
+	prompt "";
+
 	prompt "To write a new config, run 'make config'";
 	prompt "";
 
-- 
2.11.0