diff options
Diffstat (limited to 'bin/installto.sh')
| -rwxr-xr-x | bin/installto.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/installto.sh b/bin/installto.sh index e6cf79d7d..269a5dc06 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -26,17 +26,17 @@ require_once INSTALL_PATH . 'program/include/clisetup.php'; $target_dir = unslashify($_SERVER['argv'][1]); if (empty($target_dir) || !is_dir(realpath($target_dir))) - die("Invalid target: not a directory\nUsage: installto.sh <TARGET>\n"); + rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh <TARGET>", false, true); // read version from iniset.php $iniset = @file_get_contents($target_dir . '/program/include/iniset.php'); if (!preg_match('/define\(.RCMAIL_VERSION.,\s*.([0-9.]+[a-z-]*)/', $iniset, $m)) - die("No valid Roundcube installation found at $target_dir\n"); + rcube::raise_error("No valid Roundcube installation found at $target_dir", false, true); $oldversion = $m[1]; if (version_compare(version_parse($oldversion), version_parse(RCMAIL_VERSION), '>=')) - die("Installation at target location is up-to-date!\n"); + rcube::raise_error("Installation at target location is up-to-date!", false, true); echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n"; $input = trim(fgets(STDIN)); @@ -50,7 +50,7 @@ if (strtolower($input) == 'y') { break; } } - foreach (array('index.php','.htaccess','config/main.inc.php.dist','config/db.inc.php.dist','CHANGELOG','README.md','UPGRADING','LICENSE') as $file) { + foreach (array('index.php','.htaccess','config/defaults.inc.php','CHANGELOG','README.md','UPGRADING','LICENSE') as $file) { if (!system("rsync -av " . INSTALL_PATH . "$file $target_dir/$file")) { $err = true; break; |