Revision 42926 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh

View differences:

gvSIG.sh
51 51
# Identify OS and Architecture  #
52 52
####################
53 53

  
54
UNAME=$(uname -a | tr '[:upper:]' '[:lower:]')
54
UNAME=$(uname -p -o | tr '[:upper:]' '[:lower:]')
55 55
case "$UNAME" in
56 56
*darwin*)
57 57
    OS="macosx"
......
242 242
JAVA_HOME_OTHER_ARCHITECTURE=""
243 243

  
244 244
# PRIVATE JAVA HOMEs
245
PJH1=
246
PJH2=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.6* 2>/dev/null | head -1)
247
PJH3=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.5* 2>/dev/null | head -1)
248
PJH4=
249
PJH5=
250
PJH6=
251 245
if [ -d "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre" ] ; then
252 246
    PJH1="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre"
253
    if [ -f "$PJH1/bin/java" ] ; then
254
        if [ ! -x "$PJH1/bin/java" ] ; then
255
            chmod a+x "$PJH1/bin/java"
256
        fi
257
    fi
247
else
248
    PJH1=
258 249
fi
250
PJH2=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.8* 2>/dev/null | head -1)
251
PJH3=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.7* 2>/dev/null | head -1)
252
PJH4=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.6* 2>/dev/null | head -1)
253
PJH5=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.5* 2>/dev/null | head -1)
259 254
if [ -d /usr/lib/jvm ] ; then
260 255
    PJH6=$(find /usr/lib/jvm -maxdepth 1 ! -name "jvm" -name "[a-zA-Z]*" ! -type l -print)
256
else
257
    PJH6=
261 258
fi
262 259

  
260
if [ -f "$PJH1/bin/java" ] ; then
261
    if [ ! -x "$PJH1/bin/java" ] ; then
262
	chmod a+x "$PJH1/bin/java"
263
    fi
264
fi
265

  
263 266
#
264
# in next line, JAVA_HOME is set during instalation process
265
DEFAULT_JAVA_HOME="${JAVA_HOME}"
266 267
#
267
#
268 268
# Try to use java from:
269 269
# 1. Java specified in JAVA_HOME variable
270
# 2. Java specified in the instalation process
271
# 3. Java in gvSIG/extensiones/jre (jre plugin)
272
# 4. Java in the HOME/gvsig/jre folder (old gvsig versions optionally create during installation process)
270
# 2. Java in gvSIG/extensiones/jre (jre plugin)
271
# 3. Java in the HOME/gvsig/jre folder (old gvsig versions optionally create during installation process)
272
# 4. Java installed in the system (/usr/lib/jvm)
273 273
# 5. Java in the system path.
274 274
#
275
for JAVA_HOME_TO_USE in "$JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" $PJH6 ""
276
do
277
  if [ "$JAVA_HOME_TO_USE" = "" ] ; then
278
	  continue
279
  fi
280
  logger_info "Located possible jre at: ${JAVA_HOME_TO_USE}"
281
done
275 282

  
276
for JAVA_HOME_TO_USE in "$JAVA_HOME" "$DEFAULT_JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" $PJH6 ""
283
for JAVA_HOME_TO_USE in "$JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" $PJH6 ""
277 284
do
278 285
        if [ "$JAVA_HOME_TO_USE" = "" ] ; then
279 286
                continue
......
367 374
# gvSIG java libraries location
368 375
###################################################################
369 376

  
370
export LIBRARIES=""
371 377
# Load gvSIG Andami jars and dependencies for the classpath
372 378
for i in "$GVSIG_INSTALL_FOLDER/lib/"*.jar ; do
373 379
  if [ "$i" != "$GVSIG_INSTALL_FOLDER/lib/*.jar" -a "$i" != "" ]; then
374
    LIBRARIES="${LIBRARIES}${CPSEP}${i}"
380
    add_classpath "$i"
375 381
  fi
376 382
done
377 383
for i in "$GVSIG_INSTALL_FOLDER/lib/"*.zip ; do
378 384
  if [ "$i" != "$GVSIG_INSTALL_FOLDER/lib/*.zip" -a "$i" != "" ]; then
379
    LIBRARIES="${LIBRARIES}${CPSEP}${i}"
385
    add_classpath "$i"
380 386
  fi
381 387
done
382 388

  
383
# echo Initial libraries found: ${LIBRARIES}
384

  
385 389
# gvSIG Andami launcher
386 390

  
387 391
if [ "$GVSIG_LAUNCHER" = "" ] ; then
......
394 398
export GVSIG_LAUNCHER
395 399
export GVSIG_PARAMS
396 400

  
397
# gvSIG initial classpath
398
export GVSIG_CLASSPATH="$LIBRARIES:$GVSIG_CLASSPATH"
399

  
400 401
########################
401 402
# Memory configuration #
402 403
########################

Also available in: Unified diff