From 28c9b764b661968c2711fd24a167d3adc11af864 Mon Sep 17 00:00:00 2001 From: Nikolaus Krismer <niko@krismer.de> Date: Tue, 18 Feb 2014 17:58:48 +0100 Subject: [PATCH] added correct java handling for 32bit operating systems --- etc/vagrant/bootstrap.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh index 49edd567..c72b2dd0 100644 --- a/etc/vagrant/bootstrap.sh +++ b/etc/vagrant/bootstrap.sh @@ -61,7 +61,8 @@ GEOSERVER_FILE=geoserver-$GEOSERVER_VERSION-war.zip GEOSERVER_SHELL_VERSION=0.2-SNAPSHOT GEOSERVER_SHELL_FILE=gs-shell-$GEOSERVER_SHELL_VERSION-app.zip JAVA_VERSION=7u45 -JAVA_FILE=jdk-$JAVA_VERSION-linux-x64.rpm +JAVA_FILE_32=jdk-$JAVA_VERSION-linux-i586.rpm +JAVA_FILE_64=jdk-$JAVA_VERSION-linux-x64.rpm MAVEN_VERSION=3.1.1 MAVEN_FILE=apache-maven-$MAVEN_VERSION-bin.zip NEO4J_DB_USER=neo4j @@ -144,9 +145,11 @@ fi if $IS_64_BIT; then POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_64 REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_64 + JAVA_FILE=$JAVA_FILE_64 else POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_32 REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_32 + JAVA_FILE=$JAVA_FILE_32 fi START=$(date +%s) -- GitLab