Revision 41310
| trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh | ||
|---|---|---|
| 95 | 95 |
# Logger config # |
| 96 | 96 |
################# |
| 97 | 97 |
|
| 98 |
LOGGER_FILE="$GVSIG_HOME_FOLDER/${GVSIG_APPLICATION_NAME}.log"
|
|
| 98 |
LOGGER_FILE="$GVSIG_HOME_FOLDER/${GVSIG_APPLICATION_NAME}-launcher.log"
|
|
| 99 | 99 |
|
| 100 | 100 |
logger () {
|
| 101 | 101 |
# level (INFO/WARNIG) message |
| ... | ... | |
| 152 | 152 |
PJH2=$(ls -dt "$GVSIG_HOME_FOLDER/jre/"*1.5* 2>/dev/null | head -1) |
| 153 | 153 |
PJH3= |
| 154 | 154 |
PJH4= |
| 155 |
PJH5="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586/jre" |
|
| 155 |
PJH5= |
|
| 156 |
PJH6= |
|
| 157 |
if [ -d "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586/jre" ] ; then |
|
| 158 |
PJH5="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586/jre" |
|
| 159 |
fi |
|
| 160 |
if [ -d /usr/lib/jvm ] ; then |
|
| 161 |
PJH6=$(find /usr/lib/jvm -maxdepth 1 ! -name "jvm" -name "[a-zA-Z]*" ! -type l -print) |
|
| 162 |
fi |
|
| 156 | 163 |
|
| 157 | 164 |
# |
| 158 | 165 |
# in next line, JAVA_HOME is set during instalation process |
| ... | ... | |
| 170 | 177 |
export FORCE_JAVA_32BITS |
| 171 | 178 |
|
| 172 | 179 |
|
| 173 |
for JAVA_HOME_TO_USE in "$JAVA_HOME" "$DEFAULT_JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" "" |
|
| 180 |
for JAVA_HOME_TO_USE in "$JAVA_HOME" "$DEFAULT_JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" $PJH6 ""
|
|
| 174 | 181 |
do |
| 175 | 182 |
if [ "$JAVA_HOME_TO_USE" = "" ] ; then |
| 176 | 183 |
continue |
| 177 | 184 |
fi |
| 185 |
logger_info "Checking JAVA_HOME ${JAVA_HOME_TO_USE}..."
|
|
| 178 | 186 |
if [ ! -d "$JAVA_HOME_TO_USE" ] ; then |
| 179 |
logger_warn "Incorrect JAVA_HOME ($JAVA_HOME_TO_USE), skip"
|
|
| 187 |
logger_warn "Folder not found ($JAVA_HOME_TO_USE), skip"
|
|
| 180 | 188 |
continue |
| 181 | 189 |
fi |
| 182 | 190 |
if [ ! -x "$JAVA_HOME_TO_USE/bin/java" ] ; then |
| 183 |
logger_warn "Inicorrect JAVA_HOME ($JAVA_HOME_TO_USE), bin/java not found, skip"
|
|
| 191 |
logger_warn "Not a valid JAVA_HOME ($JAVA_HOME_TO_USE), bin/java not found, skip"
|
|
| 184 | 192 |
continue |
| 185 | 193 |
fi |
| 186 | 194 |
JAVA_ARCH="$(getJavaArchitecture $JAVA_HOME_TO_USE/bin/java)" |
| ... | ... | |
| 344 | 352 |
$DEBUG_OPTIONS \ |
| 345 | 353 |
-Djava.library.path="${GVSIG_NATIVE_LIBS}":/usr/lib \
|
| 346 | 354 |
-cp $GVSIG_CLASSPATH \ |
| 347 |
$GVSIG_LAUNCHER $GVSIG_PARAMS |
|
| 355 |
$GVSIG_LAUNCHER $GVSIG_PARAMS |
|
Also available in: Unified diff