Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 11:56:09 +02:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Matias Griese
2016-03-07 20:27:29 +02:00
parent 10a89cf4e7 a87315c57d
commit 9a83977913
4 changed files with 1544 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -22,7 +22,7 @@
"mrclay/minify": "~2.2",
"donatj/phpuseragentparser": "~0.3",
"pimple/pimple": "~3.0",
"rockettheme/toolbox": "dev-develop",
"rockettheme/toolbox": "~1.0",
"maximebf/debugbar": "~1.10",
"ext-mbstring": "*",
"ext-openssl": "*",

1546
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

21
system/src/Grav/Console/Gpm/InstallCommand.php
View File

@@ -184,16 +184,19 @@ class InstallCommand extends ConsoleCommand
if (in_array($packageName, array_keys($dependencies))) {
$this->output->writeln("<green>Package " . $packageName . " already installed as dependency</green>");
} else {
Installer::isValidDestination($this->destination . DS . $package->install_path);
$is_valid_destination = Installer::isValidDestination($this->destination . DS . $package->install_path);
if ($is_valid_destination || Installer::lastErrorCode() == Installer::NOT_FOUND) {
$this->processPackage($package, true);
} else {
if (Installer::lastErrorCode() == Installer::EXISTS) {
$helper = $this->getHelper('question');
$question = new ConfirmationQuestion("The package <cyan>$packageName</cyan> is already installed, overwrite? [y|N] ", false);
if (Installer::lastErrorCode() == Installer::EXISTS) {
$helper = $this->getHelper('question');
$question = new ConfirmationQuestion("The package <cyan>$packageName</cyan> is already installed, overwrite? [y|N] ", false);
if ($helper->ask($this->input, $this->output, $question)) {
$this->processPackage($package, true);
} else {
$this->output->writeln("<yellow>Package " . $packageName . " not overwritten</yellow>");
if ($helper->ask($this->input, $this->output, $question)) {
$this->processPackage($package, true);
} else {
$this->output->writeln("<yellow>Package " . $packageName . " not overwritten</yellow>");
}
}
}
}

1
system/src/Grav/Console/Gpm/UpdateCommand.php
View File

@@ -204,6 +204,7 @@ class UpdateCommand extends ConsoleCommand
}
if (count($ignore)) {
$this->output->writeln('');
$this->output->writeln("Packages not found or not requiring updates: <red>" . implode('</red>, <red>',
$ignore) . "</red>");
}