Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84DC318F39 for ; Fri, 11 Dec 2015 12:39:51 +0000 (UTC) Received: (qmail 85661 invoked by uid 500); 11 Dec 2015 12:39:51 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 85600 invoked by uid 500); 11 Dec 2015 12:39:51 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 85491 invoked by uid 99); 11 Dec 2015 12:39:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 12:39:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2195DE0AF0; Fri, 11 Dec 2015 12:39:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sjcorbett@apache.org To: commits@brooklyn.apache.org Date: Fri, 11 Dec 2015 12:39:55 -0000 Message-Id: <8dfb12b34bca491e94b72e10d9e13ee7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/15] incubator-brooklyn git commit: Derive artefact and directory names from download URL. Derive artefact and directory names from download URL. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6fcc0e62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6fcc0e62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6fcc0e62 Branch: refs/heads/master Commit: 6fcc0e623208a803abb01124384f4b1e91c2b34a Parents: 89440c3 Author: Alasdair Hodge Authored: Wed Dec 9 11:22:04 2015 +0000 Committer: Alasdair Hodge Committed: Wed Dec 9 12:57:53 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/entity/database/mysql/MySqlSshDriver.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fcc0e62/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java index 2d14726..7b38cbd 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -111,14 +111,15 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements return "mymysql.cnf"; } - public String getInstallFilename() { - return String.format("mysql-%s-%s.tar.gz", getVersion(), getOsTag()); + public String getDefaultUnpackedDirectoryName() { + return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz"); } @Override public void preInstall() { - resolver = Entities.newDownloader(this, ImmutableMap.of("filename", getInstallFilename())); - setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("mysql-%s-%s", getVersion(), getOsTag())))); + resolver = Entities.newDownloader(this); + String unpackedDirectoryName = resolver.getUnpackedDirectoryName(getDefaultUnpackedDirectoryName()); + setExpandedInstallDir(Os.mergePaths(getInstallDir(), unpackedDirectoryName)); } @Override