Merge branch 'develop'

Author: tobias-kuendig

README.md

@@ -83,7 +83,7 @@ git:
 
     bareRepo: true          # Exclude everything except themes and custom plugins in git  
     excludePlugins: false   # Even exclude plugins from your repo. Private plugins will be
-                            # checkout out again during each "install" run. Be careful!
+                            # checked out again during each "install" run. Be careful!
                             # Manual changes to these plugins will be overwritten.        
 
 plugins:
@@ -205,9 +205,9 @@ to your git repo automatically.
 ### File templates
 
 You can overwrite all default file templates by creating a folder called `october` in your global composer directory.
-Usually it is located under `~/.composer/`.
+Usually it is located under `~/.config/composer`.
 
-Place the files you want to use as defaults in `~/.composer/october`. All files from the `templates` directory can be overwritten.
+Place the files you want to use as defaults in `~/.config/composer/october`. All files from the `templates` directory can be overwritten.
 
 ## ToDo
 

october

@@ -8,7 +8,7 @@ if (file_exists(__DIR__.'/../../autoload.php')) {
     require __DIR__.'/vendor/autoload.php';
 }
 
-$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.2.25');
+$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.2.26');
 $app->add(new \OFFLINE\Bootstrapper\October\Console\InitCommand);
 $app->add(new \OFFLINE\Bootstrapper\October\Console\InstallCommand);
 $app->run();

src/Config/Writer.php

@@ -90,7 +90,12 @@ public function removeCurrentEnv()
      */
     public function createEnvExample()
     {
-        copy($this->env, $this->env . '.example');
+        $file = $this->env . '.example';
+
+        copy($this->env, $file);
+
+        $this->replaceLine('DB_USERNAME', 'DB_USERNAME=', $file);
+        $this->replaceLine('DB_PASSWORD', 'DB_PASSWORD=', $file);
 
         return $this;
     }