Outputs iso-8859-1 in addresses list as excel cannot open utf-8 csv properly.

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

diff --git a/upgrade/1.0.1/update.sh b/upgrade/1.0.1/update.sh
index 40f1278..a7156f0 100755 (executable)
--- a/upgrade/1.0.1/update.sh
+++ b/upgrade/1.0.1/update.sh
@@ -3,12 +3,14 @@
 . ../inc/pervasive.sh
 
 ###########################################################
-[ "$DATABASE" != "x5dat" ] || die "Cannot target x5dat"
+[ "$DATABASE" != "x4dat" ] || die "Cannot target x4dat"
 copy_db
 
-echo "* switching engines to InnoDB"
-(./innodb.sh | while read line; do mysql_exec "$line"; done) || die "ERROR"
-echo "OK"
+confirm "* Running pre-engine switch database upgrade script"
+mysql_run ./99_keys.sql.pre
+
+confirm "* switching engines to InnoDB"
+./innodb.sh | mysql_pipe
 
 confirm "* Running database upgrade scripts"
 mysql_run_directory .