Skip to content
Snippets Groups Projects
Commit 28c9b764 authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

added correct java handling for 32bit operating systems

parent 06276fb5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
etc/vagrant/bootstrap.sh
+ 4
− 1
View file @ 28c9b764
...@@ -61,7 +61,8 @@ GEOSERVER_FILE=geoserver-$GEOSERVER_VERSION-war.zip ...@@ -61,7 +61,8 @@ GEOSERVER_FILE=geoserver-$GEOSERVER_VERSION-war.zip
GEOSERVER_SHELL_VERSION=0.2-SNAPSHOT GEOSERVER_SHELL_VERSION=0.2-SNAPSHOT
GEOSERVER_SHELL_FILE=gs-shell-$GEOSERVER_SHELL_VERSION-app.zip GEOSERVER_SHELL_FILE=gs-shell-$GEOSERVER_SHELL_VERSION-app.zip
JAVA_VERSION=7u45 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_VERSION=3.1.1
MAVEN_FILE=apache-maven-$MAVEN_VERSION-bin.zip MAVEN_FILE=apache-maven-$MAVEN_VERSION-bin.zip
NEO4J_DB_USER=neo4j NEO4J_DB_USER=neo4j
...@@ -144,9 +145,11 @@ fi ...@@ -144,9 +145,11 @@ fi
if $IS_64_BIT; then if $IS_64_BIT; then
POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_64 POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_64
REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_64 REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_64
JAVA_FILE=$JAVA_FILE_64
else else
POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_32 POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_32
REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_32 REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_32
JAVA_FILE=$JAVA_FILE_32
fi fi
START=$(date +%s) START=$(date +%s)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment