From f23ef1c96859f6b01a9268c8606a22ceb719cf3d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 26 Apr 2013 11:26:58 +0200 Subject: Fix error handling in CLI mode, use STDERR and non-empty exit code (#1489043) --- bin/installto.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/installto.sh') diff --git a/bin/installto.sh b/bin/installto.sh index e6cf79d7d..8e1ab1fbf 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 \n"); + rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh ", 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)); -- cgit v1.2.3