usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [1/7] git commit: Fix for failing java sdk copying.
Date Fri, 18 Jul 2014 13:15:34 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/cloud-formation-scripts 9046e8899 -> 8662f778f


Fix for failing java sdk copying.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/92e6b5a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/92e6b5a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/92e6b5a2

Branch: refs/heads/cloud-formation-scripts
Commit: 92e6b5a2c90fcdeead65fcdb341f654ac9daae8e
Parents: 9046e88
Author: grey <greyes@apigee.com>
Authored: Mon Jul 7 15:47:42 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Mon Jul 7 15:47:42 2014 -0700

----------------------------------------------------------------------
 .../main/dist/init_instance/install_oraclejdk.sh    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/92e6b5a2/stack/awscluster/src/main/dist/init_instance/install_oraclejdk.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_oraclejdk.sh b/stack/awscluster/src/main/dist/init_instance/install_oraclejdk.sh
index 20a2311..dd41390 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_oraclejdk.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_oraclejdk.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 pushd /tmp
 
-# 
+#
 #  Licensed to the Apache Software Foundation (ASF) under one or more
 #   contributor license agreements.  The ASF licenses this file to You
 #  under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License.
 #  You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,22 +29,22 @@ echo ${RELEASE_BUCKET}
 # Get JDK from the release bucket
 s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/jdk-7u45-linux-x64.gz
 
-# Install it as they do here: 
+# Install it as they do here:
 # http://askubuntu.com/questions/56104/how-can-i-install-sun-oracles-proprietary-java-6-7-jre-or-jdk
 tar -xvf jdk-7u45-linux-x64.gz
 mkdir -p /usr/lib/jvm
-mv ./jdk1.7.0_45 /usr/lib/jvm/jdk1.7.0
+mv ./jdk1.7.0_60 /usr/lib/jvm/jdk1.7.0
 
 update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jdk1.7.0/bin/java" 2000
 update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk1.7.0/bin/javac"
2000
 update-alternatives --install "/usr/bin/javaws" "javaws" "/usr/lib/jvm/jdk1.7.0/bin/javaws"
2000
 
-chmod a+x /usr/bin/java 
-chmod a+x /usr/bin/javac 
+chmod a+x /usr/bin/java
+chmod a+x /usr/bin/javac
 chmod a+x /usr/bin/javaws
 chown -R root:root /usr/lib/jvm/jdk1.7.0
 
 sudo rm /usr/lib/jvm/default-java
 sudo ln -s /usr/lib/jvm/jdk1.7.0 /usr/lib/jvm/default-java
 
-popd
\ No newline at end of file
+popd


Mime
View raw message