From d6cb9b6834792792b7568e85a6a00d9dab25c68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <flink@belfalas.eu>
Date: Wed, 30 Sep 2015 23:52:20 +0200
Subject: [PATCH] Use complete service URL when checking config

---
 functions | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/functions b/functions
index 523f2c3..4560a6e 100755
--- a/functions
+++ b/functions
@@ -75,8 +75,7 @@ service_link() {
   local SERVICE_NAME=$(get_service_name "$SERVICE")
   local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   local EXISTING_CONFIG=$(dokku config "$APP")
-  local DATABASE_NAME=$(get_database_name "$SERVICE")
-  local LINK=$(echo "$EXISTING_CONFIG" | grep "$PLUGIN_SCHEME://.*/$DATABASE_NAME" | cut -d: -f1) || true
+  local LINK=$(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1) || true
   local DEFAULT_ALIAS=$(echo "$EXISTING_CONFIG" | grep "${PLUGIN_DEFAULT_ALIAS}_URL") || true
   local SERVICE_ALIAS=$(service_alias "$SERVICE")
   local LINKS_FILE="$SERVICE_ROOT/LINKS"
@@ -258,9 +257,8 @@ service_unlink() {
   local SERVICE_URL=$(service_url "$SERVICE")
   local SERVICE_NAME=$(get_service_name "$SERVICE")
   local EXISTING_CONFIG=$(dokku config "$APP")
-  local DATABASE_NAME=$(get_database_name "$SERVICE")
   local SERVICE_ALIAS=$(service_alias "$SERVICE")
-  local LINK=($(echo "$EXISTING_CONFIG" | grep "$PLUGIN_SCHEME://.*/$DATABASE_NAME" | cut -d: -f1)) || true
+  local LINK=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true
 
   [[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
   remove_from_links_file "$SERVICE" "$APP"
@@ -319,8 +317,8 @@ promote() {
   local APP="$2"
   local PLUGIN_DEFAULT_CONFIG_VAR="${PLUGIN_DEFAULT_ALIAS}_URL"
   local EXISTING_CONFIG=$(dokku config "$APP")
-  local DATABASE_NAME=$(get_database_name "$SERVICE")
-  local CONFIG_VARS=($(echo "$EXISTING_CONFIG" | grep "$PLUGIN_SCHEME://.*/$DATABASE_NAME" | cut -d: -f1)) || true
+  local SERVICE_URL=$(service_url "$SERVICE")
+  local CONFIG_VARS=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true
   local PREVIOUS_DEFAULT_URL=$(get_url_from_config "$EXISTING_CONFIG" "$PLUGIN_DEFAULT_CONFIG_VAR")
 
   [[ -z ${CONFIG_VARS[*]} ]] && dokku_log_fail "Not linked to app $APP"