diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh index 49edd56720f46ca208b2d630f8ddee1e1f958ddc..c72b2dd08b06bf9bcc2622fd2edc10b1e00c5d54 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)