github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Strip the dokku- part from plugins on install

Browse Source
This commit is contained in:
Loïc Guitaut
2015-09-21 11:56:27 +02:00
parent 0f14e9652f
commit 9b9e983d2c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/plugin/commands
View File

@@ -17,7 +17,7 @@ case "$1" in
;; ;;
https:*|git:*) https:*|git:*)
PLUGIN_GIT_URL="$2" PLUGIN_GIT_URL="$2"
download_and_enable_plugin $PLUGIN_GIT_URL download_and_enable_plugin "$PLUGIN_GIT_URL" "$3"
plugn trigger install plugn trigger install
;; ;;
*) *)
@@ -37,7 +37,7 @@ case "$1" in
case "$2" in case "$2" in
https:*|git:*) https:*|git:*)
PLUGIN_GIT_URL="$2" PLUGIN_GIT_URL="$2"
download_and_enable_plugin $PLUGIN_GIT_URL download_and_enable_plugin "$PLUGIN_GIT_URL" "$3"
plugn trigger update plugn trigger update
;; ;;
*) *)

15
plugins/plugin/functions
View File

@@ -21,15 +21,17 @@ enable_plugin() {
download_plugin() { download_plugin() {
local PLUGIN_GIT_URL="$1" local PLUGIN_GIT_URL="$1"
plugn install $PLUGIN_GIT_URL local PLUGIN_NAME="$2"
plugn install "$PLUGIN_GIT_URL" "$PLUGIN_NAME"
} }
download_and_enable_plugin() { download_and_enable_plugin() {
local PLUGIN_GIT_URL="$1" local PLUGIN_GIT_URL="$1"
local PLUGIN_NAME=$(echo $PLUGIN_GIT_URL | awk -F '/' '{ print $NF }' | sed -e "s:.git::g") local CUSTOM_NAME="$2"
local PLUGIN_NAME=${CUSTOM_NAME:-$(plugin_name "$PLUGIN_GIT_URL")}
dokku_log_info1_quiet "Cloning plugin repo $PLUGIN_GIT_URL to $PLUGIN_AVAILABLE_PATH/$PLUGIN_NAME" dokku_log_info1_quiet "Cloning plugin repo $PLUGIN_GIT_URL to $PLUGIN_AVAILABLE_PATH/$PLUGIN_NAME"
download_plugin $PLUGIN_GIT_URL download_plugin "$PLUGIN_GIT_URL" "$PLUGIN_NAME"
enable_plugin $PLUGIN_NAME enable_plugin "$PLUGIN_NAME"
} }
uninstall_plugin() { uninstall_plugin() {
@@ -39,3 +41,8 @@ uninstall_plugin() {
plugn uninstall $PLUGIN_NAME plugn uninstall $PLUGIN_NAME
dokku_log_info1_quiet "Plugin $PLUGIN uninstalled" dokku_log_info1_quiet "Plugin $PLUGIN uninstalled"
} }
plugin_name() {
local PLUGIN_GIT_URL="$1"
echo "$PLUGIN_GIT_URL" | awk -F '/' '{ print $NF }' | sed -e "s:.git::g" | sed 's:^dokku-::'
}