Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-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 C7901172CC for ; Mon, 20 Oct 2014 13:46:32 +0000 (UTC) Received: (qmail 11701 invoked by uid 500); 20 Oct 2014 13:46:30 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 11652 invoked by uid 500); 20 Oct 2014 13:46:30 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 11158 invoked by uid 99); 20 Oct 2014 13:46:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Oct 2014 13:46:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 056F99B167D; Mon, 20 Oct 2014 13:46:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snoopdave@apache.org To: commits@usergrid.apache.org Date: Mon, 20 Oct 2014 13:47:10 -0000 Message-Id: <4aae4d1f38764243ad20dd92f4e422b3@git.apache.org> In-Reply-To: <3886f80d5df9455c8ecb83dfd658e8af@git.apache.org> References: <3886f80d5df9455c8ecb83dfd658e8af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/50] [abbrv] git commit: Fixed source execution order Fixed source execution order Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/31193199 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/31193199 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/31193199 Branch: refs/heads/two-dot-o-events Commit: 31193199e767a660baa8b58431e48e202e6d98c1 Parents: 06dd703 Author: Todd Nine Authored: Fri Oct 17 17:50:21 2014 -0600 Committer: Todd Nine Committed: Fri Oct 17 17:50:21 2014 -0600 ---------------------------------------------------------------------- .../src/main/dist/init_instance/init_rest_server.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/31193199/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh ---------------------------------------------------------------------- diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh index 6df1f59..b370f34 100644 --- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh +++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh @@ -41,14 +41,17 @@ cp /usr/share/aws-java-sdk-*/third-party/*/*.jar /home/ubuntu/.groovy/lib cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib ln -s /home/ubuntu/.groovy /root/.groovy +# Build environment for Groovy scripts +. /etc/profile.d/aws-credentials.sh +. /etc/profile.d/usergrid-env.sh + + # tag last so we can see in the console so that we know what's running cd /usr/share/usergrid/scripts groovy tag_instance.groovy -BUILD-IN-PROGRESS -# Build environment for Groovy scripts -. /etc/profile.d/aws-credentials.sh -. /etc/profile.d/usergrid-env.sh + chmod +x /usr/share/usergrid/update.sh cd /usr/share/usergrid/init_instance