Index: trunk/ippToPsps/test/mkgpc1.sh
===================================================================
--- trunk/ippToPsps/test/mkgpc1.sh	(revision 37246)
+++ trunk/ippToPsps/test/mkgpc1.sh	(revision 38888)
@@ -11,8 +11,6 @@
   set dbpass = $4
 
-  mysql -h $dbhost -u root -p <<EOF
-   grant all on *.* to $dbuser@"$dbhost" identified by '$dbpass';
-EOF
-    exit 0;
+  mysql -h $dbhost -u root -p -e "grant all on *.* to $dbuser@"$dbhost" identified by '$dbpass'"
+  exit 0;
 endif
 
@@ -29,108 +27,7 @@
 
   # create a database with completely minimal tables needed to test
-  mysql -h $dbhost -u $dbuser $dbpass <<EOF
-   CREATE DATABASE $dbname;
-   USE $dbname;
-  CREATE TABLE ippToPspsFake (
-    my_id INT
-  );
-  CREATE TABLE skycell (
-   radeg REAL,
-   decdeg REAL,
-   skycell_id CHAR(64)
-  );
-  CREATE TABLE rawExp (
-   exp_id INT,
-   exp_name CHAR(64),
-   exp_time REAL,
-   bg REAL,
-   bg_stdev REAL,
-   ra FLOAT,
-   decl FLOAT,
-   dateobs DATETIME 
-  );
-  CREATE TABLE chipRun (
-    exp_id INT,
-    chip_id INT
-  );
-  CREATE TABLE camRun (
-    chip_id INT,
-    cam_id INT,
-    dist_group CHAR(64),
-    software_ver CHAR(16)
-  );
-  CREATE TABLE camProcessedExp (
-    path_base CHAR(255),
-    cam_id INT,
-    fault INT
-  );
-  CREATE TABLE fakeRun (
-    fake_id INT,
-    cam_id INT
-  );
-  CREATE TABLE warpRun (
-   warp_id INT,
-   fake_id INT
-  );
-  CREATE TABLE warpSkyCellMap (
-   warp_id INT,
-   skycell_id CHAR(64),
-   class_id CHAR(64)
-  );
-  CREATE TABLE stackRun (
-   stack_id INT,
-   skycell_id CHAR(64),
-   filter CHAR(64),
-   software_ver CHAR(16)
-  );
-  CREATE TABLE stackInputSkyfile (
-   stack_id INT,
-   warp_id INT
-  );
-  CREATE TABLE stackSumSkyfile (
-   stack_id INT,
-   mjd_obs DOUBLE
-  );
-  CREATE TABLE skycalRun (
-   sky_id INT,
-   skycal_id INT,
-   stack_id INT
-  );
-  CREATE TABLE skycalResult (
-   path_base CHAR(255),
-   skycal_id INT
-  );
-  CREATE TABLE addRun (
-    add_id INT,
-    stage CHAR(64),
-    state CHAR(64),
-    stage_id INT,
-    minidvodb_name CHAR(64)
-  );
-  CREATE TABLE addProcessedExp (
-    add_id INT,
-    fault INT
-  );
-  CREATE TABLE minidvodbRun (
-   minidvodb_name CHAR(64),
-   minidvodb_id INT,
-   state CHAR(64)
-  );
-  CREATE TABLE minidvodbProcessed (
-   minidvodb_id INT,
-   fault INT
-  );
-  CREATE TABLE mergedvodbRun (
-   minidvodb_id INT,
-   merge_id INT,
-   state CHAR(64),
-   mergedvodb CHAR(64)
-  );
-  CREATE TABLE mergedvodbProcessed (
-   merge_id INT,
-   fault INT
-  );
-EOF
-    exit 0;
+  mysql -h $dbhost -u $dbuser $dbpass -e "CREATE DATABASE $dbname"
+  mysql -h $dbhost -u $dbuser $dbpass $dbname < gpc1schema.sql
+  exit 0;
 endif
 
@@ -146,8 +43,12 @@
   endif
 
-  mysql -h $dbhost -u $dbuser $dbpass <<EOF
-   USE $dbname;
-   describe ippToPspsFake;
-EOF
+  (mysql -B -h $dbhost -u $dbuser $dbpass -e "show databases" | grep ^$dbname\$) >& /dev/null
+  if ($status) then
+    echo "database $dbname does not yet exist"
+    exit 0
+  endif
+
+  # mysql -h $dbhost -u $dbuser $dbpass $dbname -e "show tables"
+  mysql -h $dbhost -u $dbuser $dbpass $dbname -e "describe ippToPspsFake" >& /dev/null
   if ($status) then
     echo "database does not contain ippToPspsFake, not deleting"
@@ -155,17 +56,14 @@
   endif
 
-  set ntable = `echo "USE $dbname; show tables;" | mysql -h $dbhost -u $dbuser $dbpass | wc -l`
+  set ntable = `mysql -B -h $dbhost -u $dbuser $dbpass $dbname -e "show tables" | wc -l`
   echo ntable: $ntable
-  if ($ntable != 21) then
-    echo "expected 21 lines (20 tables), but got $ntable, not deleting"
+  if ($ntable != 25) then
+    echo "expected 25 lines (24 tables), but got $ntable, not deleting"
     exit 2
   endif
 
   echo "database is valid, deleting"
-  mysql -h $dbhost -u $dbuser $dbpass <<EOF
-   drop database $dbname;
-EOF
-
-   exit 0;
+  mysql -h $dbhost -u $dbuser $dbpass -e "drop database $dbname"
+  exit 0;
 endif