From 03eb13f11cf7dd695be3aab95b4e39e510169a49 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 17 Jul 2011 15:01:28 -0400
Subject: [PATCH] Small improvements and codestyle
---
bin/update.sh | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/bin/update.sh b/bin/update.sh
index 7a4d1cf..9f91c8e 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -1,12 +1,42 @@
#!/usr/bin/env php
<?php
-if (php_sapi_name() != 'cli') {
- die('Not on the "shell" (php-cli).');
-}
+/*
+ +-----------------------------------------------------------------------+
+ | bin/update.sh |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2010-2011, The Roundcube Dev Team |
+ | Licensed under the GNU GPL |
+ | |
+ | PURPOSE: |
+ | Check local configuration and database schema after upgrading |
+ | to a new version |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
-require_once INSTALL_PATH . 'program/include/iniset.php';
+require_once INSTALL_PATH . 'program/include/clisetup.php';
require_once INSTALL_PATH . 'installer/rcube_install.php';
+
+// get arguments
+$opts = get_opt(array('v' => 'version'));
+
+// ask user if no version is specified
+if (!$opts['version']) {
+ echo "What version are you upgrading from? Type '?' if you don't know.\n";
+ if (($input = trim(fgets(STDIN))) && preg_match('/^[0-9.]+[a-z-]*$/', $input))
+ $opts['version'] = $input;
+}
+
+if ($opts['version'] && version_compare($opts['version'], RCMAIL_VERSION, '>'))
+ die("Nothing to be done here. Bye!\n");
+
$RCI = rcube_install::get_instance();
$RCI->load_config();
@@ -80,7 +110,7 @@
// Success!
if ($write1 && $write2) {
echo "Done.\n";
- echo "Your configuration files are now up-tp-date!\n";
+ echo "Your configuration files are now up-to-date!\n";
}
else {
echo "Failed to write config files!\n";
@@ -88,7 +118,7 @@
}
}
else {
- echo "Please update your config files manually according to the above messages.\n";
+ echo "Please update your config files manually according to the above messages.\n\n";
}
}
@@ -113,22 +143,33 @@
echo "Error connecting to database: $db_error_msg\n";
$success = false;
}
- else if ($RCI->db_schema_check($DB, false)) {
- $updatefile = INSTALL_PATH . 'SQL/' . $DB->db_provider . '.update.sql';
+ else if ($err = $RCI->db_schema_check($DB, false)) {
+ $updatefile = INSTALL_PATH . 'SQL/' . (isset($RCI->db_map[$DB->db_provider]) ? $RCI->db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql';
echo "WARNING: Database schema needs to be updated!\n";
- echo "Open $updatefile and execute all queries that are superscribed with the currently installed version number\n";
+ echo join("\n", $err) . "\n\n";
$success = false;
+
+ if ($opts['version']) {
+ echo "Do you want to run the update queries to get the schmea fixed? (y/N)\n";
+ $input = trim(fgets(STDIN));
+ if (strtolower($input) == 'y') {
+ $success = $RCI->update_db($DB, $opts['version']);
+ }
+ }
+
+ if (!$success)
+ echo "Open $updatefile and execute all queries below the comment with the currently installed version number.\n";
}
}
if ($success) {
- echo "This instance of RoundCube is up-to-date.\n";
+ echo "This instance of Roundcube is up-to-date.\n";
echo "Have fun!\n";
}
}
else {
- echo "This instance of RoundCube is not yet configured!\n";
+ echo "This instance of Roundcube is not yet configured!\n";
echo "Open http://url-to-roundcube/installer/ in your browser and follow the instuctions.\n";
}
--
Gitblit v1.9.1