Merge remote branch 'origin/xorg/maint' into xorg/master

[platal.git] / upgrade / 1.0.0 / update.sh

diff --git a/upgrade/1.0.0/update.sh b/upgrade/1.0.0/update.sh
index d7f6f65..3a7acb3 100755 (executable)
--- a/upgrade/1.0.0/update.sh
+++ b/upgrade/1.0.0/update.sh
@@ -5,10 +5,11 @@
 ###########################################################
 [ "$DATABASE" != "x4dat" ] || die "Cannot target x4dat"
 
-confirm "Setting up new database: target db is \"$DATABASE\", source prefix is \"$DBPREFIX\""
+echo "Setting up new database: target db is \"$DATABASE\", source prefix is \"$DBPREFIX\""
+confirm "Please ensure your platal.conf is configured to use \"$DATABASE\""
 
 echo "* create database"
-mysql_exec "CREATE DATABASE IF NOT EXISTS $DATABASE;"
+mysql_exec_nodb "CREATE DATABASE IF NOT EXISTS $DATABASE;"
 echo "OK"
 
 echo "* copying tables "
@@ -23,5 +24,4 @@ mysql_run_directory .
 confirm "* Running upgrade scripts"
 script_run ../newdirectory-0.0.1/phones.php
 script_run ../newdirectory-0.0.1/addresses.php
-script_run ../newdirectory-0.0.1/alternate_subsubsectors.php
 script_run ../account/birthday.php