From 1d7f41e4a80c60f22e942cd73cb5682bae79e652 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 11 Apr 2017 11:30:27 +0200 Subject: [PATCH] Fix #1405 issue in direct-install with github-style dependencies --- CHANGELOG.md | 6 ++++++ .../src/Grav/Console/Gpm/DirectInstallCommand.php | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14d4f0203..2921f8a04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.2.2 +## 04/xx/2017 + +1. [](#bugfix) + * Fix issue in direct-install with github-style dependencies [#1405](https://github.com/getgrav/grav/issues/1405) + # v1.2.1 ## 04/10/2017 diff --git a/system/src/Grav/Console/Gpm/DirectInstallCommand.php b/system/src/Grav/Console/Gpm/DirectInstallCommand.php index 46f9bcb5b..0b368cafe 100644 --- a/system/src/Grav/Console/Gpm/DirectInstallCommand.php +++ b/system/src/Grav/Console/Gpm/DirectInstallCommand.php @@ -149,16 +149,19 @@ class DirectInstallCommand extends ConsoleCommand if (isset($blueprint['dependencies'])) { $depencencies = []; foreach ($blueprint['dependencies'] as $dependency) { - if (is_array($dependency) && isset($dependency['name'])) { - $depencencies[] = $dependency['name']; + if (is_array($dependency)){ + if (isset($dependency['name'])) { + $depencencies[] = $dependency['name']; + } + if (isset($dependency['github'])) { + $depencencies[] = $dependency['github']; + } } else { - $depencencies[] = $dependency; + $depencencies[] = $dependency; } } $this->output->writeln(" |- Dependencies found... [" . implode(',', $depencencies) . "]"); - - $question = new ConfirmationQuestion(" | '- Dependencies will not be satisfied. Continue ? [y|N] ", false); $answer = $this->all_yes ? true : $helper->ask($this->input, $this->output, $question);