From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
bin/update.sh | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/bin/update.sh b/bin/update.sh
index 5be7633..05956b9 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -1,16 +1,53 @@
-#!/usr/bin/php
+#!/usr/bin/env php
<?php
+/*
+ +-----------------------------------------------------------------------+
+ | bin/update.sh |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2010-2011, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ | PURPOSE: |
+ | Check local configuration and database schema after upgrading |
+ | to a new version |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ +-----------------------------------------------------------------------+
+*/
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 = rcube_utils::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;
+ else
+ $opts['version'] = RCMAIL_VERSION;
+}
+
+if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>='))
+ die("Nothing to be done here. Bye!\n");
+
$RCI = rcube_install::get_instance();
$RCI->load_config();
if ($RCI->configured) {
+ $success = true;
+
if ($messages = $RCI->check_config()) {
+ $success = false;
$err = 0;
// list missing config options
@@ -19,7 +56,7 @@
echo "(These config options should be present in the current configuration)\n";
foreach ($messages['missing'] as $msg) {
- echo '- ' . $msg['prop'] . ($msg['name'] ? ': ' . $msg['name'] : '') . "\n";
+ echo "- '" . $msg['prop'] . ($msg['name'] ? "': " . $msg['name'] : "'") . "\n";
$err++;
}
echo "\n";
@@ -31,7 +68,7 @@
echo "(These config options have been replaced or renamed)\n";
foreach ($messages['replaced'] as $msg) {
- echo "- " . $msg['prop'] . "\t\t was replaced by " . $msg['replacement'] . "\n";
+ echo "- '" . $msg['prop'] . "' was replaced by '" . $msg['replacement'] . "'\n";
$err++;
}
echo "\n";
@@ -43,7 +80,7 @@
echo "(You still have some obsolete or inexistent properties set. This isn't a problem but should be noticed)\n";
foreach ($messages['obsolete'] as $msg) {
- echo "- " . $msg['prop'] . ($msg['name'] ? ': ' . $msg['name'] : '') . "\n";
+ echo "- '" . $msg['prop'] . ($msg['name'] ? "': " . $msg['name'] : "'") . "\n";
$err++;
}
echo "\n";
@@ -75,7 +112,13 @@
// 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";
+
+ if ($messages['missing']) {
+ echo "But you still need to add the following missing options:\n";
+ foreach ($messages['missing'] as $msg)
+ echo "- '" . $msg['prop'] . ($msg['name'] ? "': " . $msg['name'] : "'") . "\n";
+ }
}
else {
echo "Failed to write config files!\n";
@@ -98,18 +141,30 @@
echo "Please fix your config files and run this script again!\n";
echo "See ya.\n";
}
-
}
- else {
- echo "This instance of RoundCube is up-to-date.\n";
+
+ // check database schema
+ if ($RCI->config['db_dsnw']) {
+ echo "Executing database schema update.\n";
+ system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
+ . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res);
+
+ $success = !$res;
+ }
+
+ // index contacts for fulltext searching
+ if (version_compare(version_parse($opts['version']), '0.6.0', '<')) {
+ system(INSTALL_PATH . 'bin/indexcontacts.sh');
+ }
+
+ if ($success) {
+ 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";
}
-echo "\n";
-
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1