Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-kuendig committed Jun 12, 2017
2 parents 9b44d0e + 8f7bfdf commit 3a683a8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ The following steps will be taken care of:

* Ubuntu 15.10
* Ubuntu 16.04
* OSX 10.11 (El Capitain)

Should work on OS X. Will probably not work on Windows.
Will probably not work on Windows.


## Installation
Expand Down Expand Up @@ -88,10 +89,10 @@ git:
plugins:
- Rainlab.Pages
- Rainlab.Builder
- Adrenth.Redirect
- Indikator.Backend
- OFFLINE.SiteSearch
- OFFLINE.ResponsiveImages
- OFFLINE.Indirect (https://github.com/OFFLINE-GmbH/oc-indirect-plugin.git)
# - Vendor.Private ([email protected])
# - Vendor.PrivateCustomBranch ([email protected]#branch)

Expand Down
13 changes: 10 additions & 3 deletions src/Installer/PluginInstaller.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@ public function install()
return false;
}

$isBare = (bool)$this->config->git['bareRepo'];
$excludePlugins = (bool)$this->config->git['excludePlugins'];
$isBare = isset($this->config->git['bareRepo'])
? (bool)$this->config->git['bareRepo']
: false;

$excludePlugins = isset($this->config->git['excludePlugins'])
? (bool)$this->config->git['excludePlugins']
: false;

foreach ($config as $plugin) {

Expand All @@ -48,7 +53,9 @@ public function install()

if ( ! $this->isEmpty($pluginDir)) {

if ($this->handleExistingPlugin($excludePlugins, $remote, $vendor, $plugin, $pluginDir, $isBare) === false) {
if ($this->handleExistingPlugin($excludePlugins, $remote, $vendor, $plugin, $pluginDir,
$isBare) === false
) {
continue;
}
}
Expand Down

0 comments on commit 3a683a8

Please sign in to comment.