Skip to content

Commit

Permalink
Add accept option (-y) to installto.sh script
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomascube
thomascube committed Aug 14, 2019
1 parent f5d4c80 commit 65735a6
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions bin/installto.sh
View file
Expand Up @@ -26,10 +26,11 @@ if (!function_exists('system')) {
rcube::raise_error("PHP system() function is required. Check disable_functions in php.ini.", false, true);
}

$target_dir = unslashify($_SERVER['argv'][1]);
$target_dir = unslashify(end($_SERVER['argv']));
$accept = in_array('-y', $_SERVER['argv']) ? 'y' : null;

if (empty($target_dir) || !is_dir(realpath($target_dir)))
rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh <TARGET>", false, true);
rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh [-y] <TARGET>", false, true);

// read version from iniset.php
$iniset = @file_get_contents($target_dir . '/program/include/iniset.php');
Expand All @@ -48,7 +49,7 @@ else {
echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";

This comment has been minimized.

Sign in to view

Copy link
@alecpl

alecpl Aug 16, 2019

Member

I guess this text could be modified when $accept=true so user does not see the question. We do the same in updatedb.sh.
}

$input = trim(fgets(STDIN));
$input = $accept ?: trim(fgets(STDIN));

if (strtolower($input) == 'y') {
echo "Copying files to target location...";
Expand Down Expand Up @@ -134,7 +135,7 @@ if (strtolower($input) == 'y') {
}

echo "Running update script at target...\n";
system("cd $target_dir && php bin/update.sh --version=$oldversion");
system("cd $target_dir && php bin/update.sh --version=$oldversion" . ($accept ? ' -y' : ''));
echo "All done.\n";
}
else {
Expand Down

0 comments on commit 65735a6

Please sign in to comment.