summaryrefslogtreecommitdiff
path: root/bin/gittool.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2014-12-09 20:11:00 +0100
committerAndreas Gohr <andi@splitbrain.org>2014-12-09 20:11:00 +0100
commit61a4313f55c7e83e0b78c9c6a8eb2efb13ff0512 (patch)
treec7269ea61f5d4230a6f916dbabee4ce412e0a9fb /bin/gittool.php
parent9a0ca2cfd8ac42895af3be2efbd2cab7e6d33578 (diff)
parent8702de7f7e170bddfdb622c393c3cac3446fd1c5 (diff)
downloadrpg-61a4313f55c7e83e0b78c9c6a8eb2efb13ff0512.tar.gz
rpg-61a4313f55c7e83e0b78c9c6a8eb2efb13ff0512.tar.bz2
Merge pull request #945 from splitbrain/scrutinizerissues
Scrutinizer issues and IXR library updates
Diffstat (limited to 'bin/gittool.php')
-rwxr-xr-xbin/gittool.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/gittool.php b/bin/gittool.php
index 6944dde57..cbadb5bfa 100755
--- a/bin/gittool.php
+++ b/bin/gittool.php
@@ -101,7 +101,7 @@ class GitToolCLI extends DokuCLI {
/**
* Tries to install the given extensions using git clone
*
- * @param $extensions
+ * @param array $extensions
*/
public function cmd_clone($extensions) {
$errors = array();
@@ -130,7 +130,7 @@ class GitToolCLI extends DokuCLI {
/**
* Tries to install the given extensions using git clone with fallback to install
*
- * @param $extensions
+ * @param array $extensions
*/
public function cmd_install($extensions) {
$errors = array();
@@ -206,12 +206,13 @@ class GitToolCLI extends DokuCLI {
* Install extension from the given download URL
*
* @param string $ext
- * @return bool
+ * @return bool|null
*/
private function downloadExtension($ext) {
/** @var helper_plugin_extension_extension $plugin */
$plugin = plugin_load('helper', 'extension_extension');
if(!$ext) die("extension plugin not available, can't continue");
+
$plugin->setExtension($ext);
$url = $plugin->getDownloadURL();
@@ -291,12 +292,13 @@ class GitToolCLI extends DokuCLI {
* Returns the repository for the given extension
*
* @param $extension
- * @return bool|string
+ * @return false|string
*/
private function getSourceRepo($extension) {
/** @var helper_plugin_extension_extension $ext */
$ext = plugin_load('helper', 'extension_extension');
if(!$ext) die("extension plugin not available, can't continue");
+
$ext->setExtension($extension);
$repourl = $ext->getSourcerepoURL();