From bb9d47f4cee1ab76400d0ac147657b983f004114 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 1 Jun 2010 14:45:39 +0200
Subject: [PATCH] Upgrade master is upgrade/1.0.0

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 upgrade/1.0.0/update.sh   | 30 +++++++++++++++++++++---------
 upgrade/account/update.sh | 26 --------------------------
 2 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100755 upgrade/account/update.sh

diff --git a/upgrade/1.0.0/update.sh b/upgrade/1.0.0/update.sh
index 928d1e4..3c3a41e 100755
--- a/upgrade/1.0.0/update.sh
+++ b/upgrade/1.0.0/update.sh
@@ -2,14 +2,26 @@
 
 . ../inc/pervasive.sh
 
-mailman_stop
-mailman_templates
-mailman_start
+###########################################################
+[ "$DATABASE" != "x4dat" ] || die "Cannot target x4dat"
+
+confirm "Setting up new database: target db is \"$DATABASE\", source prefix is \"$DBPREFIX\""
+
+echo -n "* create database "
+(echo "CREATE DATABASE IF NOT EXISTS $DATABASE;" | mysql_pipe) || die "ERROR"
+echo "OK"
+
+echo -n "* copying tables "
+(../account/copy_tables.sh | mysql_pipe) || die "ERROR"
+echo "OK"
+
+mysql_run_directory ../newdirectory-0.0.1
+mysql_run_directory ../account
+mysql_run_directory .
 
 ###########################################################
-for sql in *.sql
-do
-    echo -n $sql
-    $MYSQL $DATABASE < $sql &>/dev/null || echo -n " ERROR"
-    echo .
-done
+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
diff --git a/upgrade/account/update.sh b/upgrade/account/update.sh
deleted file mode 100755
index b7ec73e..0000000
--- a/upgrade/account/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. ../inc/pervasive.sh
-
-###########################################################
-[ "$DATABASE" != "x4dat" ] || die "Cannot target x4dat"
-
-confirm "Setting up new database: target db is \"$DATABASE\", source prefix is \"$DBPREFIX\""
-
-echo -n "* create database "
-(echo "CREATE DATABASE IF NOT EXISTS $DATABASE;" | mysql_pipe) || die "ERROR"
-echo "OK"
-
-echo -n "* copying tables "
-(./copy_tables.sh | mysql_pipe) || die "ERROR"
-echo "OK"
-
-mysql_run_directory ../newdirectory-0.0.1
-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 ./birthday.php
-- 
2.1.4