From 21d2cba66c9ee81e2bbb9acbd83564de248f8e46 Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Wed, 18 Jun 2008 23:51:37 +0200
Subject: [PATCH] Moves upgrade scripts to a dedicated directory (will ease up
 merge of hruid feature branch).

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---
 upgrade/0.9.17/update.sh                     |  5 -----
 upgrade/{0.9.17 => hruid}/03_hruid.sql       |  0
 upgrade/{0.9.17 => hruid}/connect.db.inc.php |  0
 upgrade/{0.9.17 => hruid}/hruid.update.php   |  0
 upgrade/hruid/update.sh                      | 24 ++++++++++++++++++++++++
 5 files changed, 24 insertions(+), 5 deletions(-)
 rename upgrade/{0.9.17 => hruid}/03_hruid.sql (100%)
 rename upgrade/{0.9.17 => hruid}/connect.db.inc.php (100%)
 rename upgrade/{0.9.17 => hruid}/hruid.update.php (100%)
 create mode 100755 upgrade/hruid/update.sh

diff --git a/upgrade/0.9.17/update.sh b/upgrade/0.9.17/update.sh
index 0e99620..f351939 100755
--- a/upgrade/0.9.17/update.sh
+++ b/upgrade/0.9.17/update.sh
@@ -16,9 +16,4 @@ do
 done
 
 ###########################################################
-echo "Creating forlife ids for unregistered user (takes a while)."
-
-./hruid.update.php
-
-###########################################################
 
diff --git a/upgrade/0.9.17/03_hruid.sql b/upgrade/hruid/03_hruid.sql
similarity index 100%
rename from upgrade/0.9.17/03_hruid.sql
rename to upgrade/hruid/03_hruid.sql
diff --git a/upgrade/0.9.17/connect.db.inc.php b/upgrade/hruid/connect.db.inc.php
similarity index 100%
rename from upgrade/0.9.17/connect.db.inc.php
rename to upgrade/hruid/connect.db.inc.php
diff --git a/upgrade/0.9.17/hruid.update.php b/upgrade/hruid/hruid.update.php
similarity index 100%
rename from upgrade/0.9.17/hruid.update.php
rename to upgrade/hruid/hruid.update.php
diff --git a/upgrade/hruid/update.sh b/upgrade/hruid/update.sh
new file mode 100755
index 0000000..0e99620
--- /dev/null
+++ b/upgrade/hruid/update.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+. ../inc/pervasive.sh
+
+mailman_stop
+mailman_templates
+mailman_start
+
+
+###########################################################
+for sql in *.sql
+do
+    echo -n $sql
+    $MYSQL x4dat < $sql &>/dev/null || echo -n " ERROR"
+    echo .
+done
+
+###########################################################
+echo "Creating forlife ids for unregistered user (takes a while)."
+
+./hruid.update.php
+
+###########################################################
+
-- 
2.1.4