Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

getgrav · Jun 8, 2017 · 1bd3d26 · 1bd3d26
2 parents 3468f59 + 947c920
commit 1bd3d26
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,9 +24,11 @@
 1. [](#improved)
     * Optionally remove unpublished pages from the translated languages, move into untranslated list [#1482](https://github.com/getgrav/grav/pull/1482)
     * Improved reliability of `hash` file-check method
+    * Improved error message when running `bin/grav install` instead of `bin/gpm install`, and also when running on a non-skeleton site [#1027](https://github.com/getgrav/grav/issues/1027)
 1. [](#bugfix)
     * Updated to latest Toolbox library to fix issue with some blueprints rendering in admin plugin [#1117](https://github.com/getgrav/grav-plugin-admin/issues/1117)
     * Fix output handling in RenderProcessor [#1483](https://github.com/getgrav/grav/pull/1483)
+    * Restore GravTrait in ConsoleTrait [grav-plugin-login#119](https://github.com/getgrav/grav-plugin-login/issues/119)
 
 # v1.3.0-rc.2
 ## 05/17/2017

diff --git a/system/src/Grav/Console/Cli/InstallCommand.php b/system/src/Grav/Console/Cli/InstallCommand.php
@@ -76,6 +76,13 @@ protected function serve()
             $this->config = Yaml::parse(file_get_contents($this->destination . $dependencies_file));
         } else {
             $this->output->writeln('<red>ERROR</red> Missing .dependencies file in <cyan>user/</cyan> folder');
+            if ($this->input->getArgument('destination')) {
+                $this->output->writeln('<yellow>HINT</yellow> <info>Are you trying to install a plugin or a theme? Make sure you use <cyan>bin/gpm install <something></cyan>, not <cyan>bin/grav install</cyan>. This command is only used to install Grav skeletons.');    
+            } else {
+                $this->output->writeln('<yellow>HINT</yellow> <info>Are you trying to install Grav? Grav is already installed. You need to run this command only if you download a skeleton from GitHub directly.');    
+            }
+
+            return;
         }
 
         // If yaml config, process

diff --git a/system/src/Grav/Console/ConsoleTrait.php b/system/src/Grav/Console/ConsoleTrait.php
@@ -10,6 +10,7 @@
 
 use Grav\Common\Grav;
 use Grav\Common\Composer;
+use Grav\Common\GravTrait;
 use Grav\Console\Cli\ClearCacheCommand;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -19,6 +20,8 @@
 
 trait ConsoleTrait
 {
+    use GravTrait;
+
     /**
      * @var
      */