Add a notice in the update script about setting the db in platal.conf.

Also remove an obsolete statement at the end of the phone upgrade script.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/upgrade/1.0.0/update.sh b/upgrade/1.0.0/update.sh
index f3e6c72..3a7acb3 100755 (executable)
--- a/upgrade/1.0.0/update.sh
+++ b/upgrade/1.0.0/update.sh
@@ -5,7 +5,8 @@
 ###########################################################
 [ "$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_nodb "CREATE DATABASE IF NOT EXISTS $DATABASE;"

diff --git a/upgrade/newdirectory-0.0.1/phones.php b/upgrade/newdirectory-0.0.1/phones.php
index f7260e8..ce10f07 100755 (executable)
--- a/upgrade/newdirectory-0.0.1/phones.php
+++ b/upgrade/newdirectory-0.0.1/phones.php
@@ -172,16 +172,6 @@ if ($warnings) {
         . " There is $warnings phone numbers that couldn't be imported.\n"
         . " They need to be manually inserted.\n";
 }
-echo  "\nAfter solving any import problem and checking automatic conversions,\n"
-    . "you can drop useless columns and tables by these requests:\n"
-    . "DROP TABLE IF EXISTS tels;\n"
-    . "ALTER TABLE auth_user_quick DROP COLUMN profile_mobile;\n"
-    . "ALTER TABLE auth_user_quick DROP COLUMN profile_mobile_pub;\n"
-    . "ALTER TABLE entreprises DROP COLUMN tel;\n"
-    . "ALTER TABLE entreprises DROP COLUMN fax;\n"
-    . "ALTER TABLE entreprises DROP COLUMN mobile;\n"
-    . "ALTER TABLE entreprises DROP COLUMN tel_pub;\n";
-
 
 // auxilliary functions