Index: org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh =================================================================== --- org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh (revisione 42673) +++ org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh (copia locale) @@ -27,9 +27,9 @@ # # Notes: -# - find command in busybox (win32) don't support "-exec" -# - trap command in busybox (win32) don't support "trap comando ERR" -# - busybox (win32) don't support statement "local" +# - find command in busybox (win32) doesn't support "-exec" +# - trap command in busybox (win32) doesn't support "trap comando ERR" +# - busybox (win32) doesn't support statement "local" # - Careful with loop "while", changes in variables within the loop are # lost when you leave this. Use "for" loops to avoid this. # @@ -46,25 +46,25 @@ } #trap onerror ERR -#################### +################################# # Identify OS and Architecture # -#################### +################################# UNAME=$(uname -a) if echo "$UNAME" | grep -i "win" >/dev/null; then OS="win" ARG_D32="" - CPSEP=";" + CPSEP=";" else if echo "$UNAME" | grep -i "lin" >/dev/null ; then OS="lin" # Only linux support -d32 arg ARG_D32="-d32" - CPSEP=":" + CPSEP=":" else OS="unknown" ARG_D32="" - CPSEP=":" + CPSEP=":" fi fi if echo "$UNAME" | egrep -i "(x86_64)|(amd64)" >/dev/null ; then @@ -77,12 +77,12 @@ getJavaArchitecture() { if [ "$ARCH" = "x86" ] ; then - # Si la arquitectura del SO es x86 decimos - # que la de java es x86 + # Si la arquitectura del SO es x86 decimos + # que la de java es x86 echo "x86" else - # si la arquitectura es x86_64, comprobamos - # la arquitectura de la java que nos pasan + # si la arquitectura es x86_64, comprobamos + # la arquitectura de la java que nos pasan if "$1" -version 2>&1 | egrep -i "64-Bit" >/dev/null ; then echo "x86_64" else @@ -139,7 +139,7 @@ logger () { - # level (INFO/WARNIG) message + # level (INFO/WARNING) message LOGGER_LEVEL="$1" shift echo "$LOGGER_LEVEL launch $@" @@ -156,27 +156,27 @@ logger_cmd() { logger_info "$@" - eval $@ 2>&1 | tee -a "$LOGGER_FILE" + eval $@ 2>&1 | tee -a "$LOGGER_FILE" } -######################### -# Locate whitch command # -######################### +######################## +# Locate which command # +######################## if type which >/dev/null; then - WHICH=which + WHICH=which else - WHICH=type + WHICH=type fi logger_info "gvSIG Installation folder: $GVSIG_INSTALL_FOLDER" logger_info "gvSIG home folder: $GVSIG_HOME_FOLDER" -########################################################## -# Search in gvSIG/extensiones the architecture of plugins -# installeds and set as PREFERED_ARCHITECTURE -# Note: Busybox n windows don't support -exec in find -########################################################## +########################################################### +# Search in gvSIG/extensiones the architecture of installed +# plugins and set as PREFERED_ARCHITECTURE +# Note: Busybox in windows doesn't support -exec in find +########################################################### setPreferedArchitecture() { pf_foundArch="" @@ -217,14 +217,14 @@ PJH5= PJH6= if [ -d "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_7_windows_i586/jre" ] ; then - PJH5="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_7_windows_i586/jre" + PJH5="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_7_windows_i586/jre" fi if [ -d /usr/lib/jvm ] ; then - PJH6=$(find /usr/lib/jvm -maxdepth 1 ! -name "jvm" -name "[a-zA-Z]*" ! -type l -print) + PJH6=$(find /usr/lib/jvm -maxdepth 1 ! -name "jvm" -name "[a-zA-Z]*" ! -type l -print) fi # -# in next line, JAVA_HOME is set during instalation process +# in next line, JAVA_HOME is set during installation process DEFAULT_JAVA_HOME="${JAVA_HOME}" # # @@ -237,49 +237,49 @@ for JAVA_HOME_TO_USE in "$JAVA_HOME" "$DEFAULT_JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" $PJH6 "" do - if [ "$JAVA_HOME_TO_USE" = "" ] ; then - continue - fi + if [ "$JAVA_HOME_TO_USE" = "" ] ; then + continue + fi logger_info "Checking JAVA_HOME ${JAVA_HOME_TO_USE}..." - if [ ! -d "$JAVA_HOME_TO_USE" ] ; then - logger_warn "Folder not found ($JAVA_HOME_TO_USE), skip" - continue - fi - if [ ! -x "$JAVA_HOME_TO_USE/bin/java" ] ; then - logger_warn "Not a valid JAVA_HOME ($JAVA_HOME_TO_USE), bin/java not found, skip" - continue - fi + if [ ! -d "$JAVA_HOME_TO_USE" ] ; then + logger_warn "Folder not found ($JAVA_HOME_TO_USE), skip" + continue + fi + if [ ! -x "$JAVA_HOME_TO_USE/bin/java" ] ; then + logger_warn "Not a valid JAVA_HOME ($JAVA_HOME_TO_USE), bin/java not found, skip" + continue + fi JAVA_ARCH=$(getJavaArchitecture "$JAVA_HOME_TO_USE/bin/java") if [ "$JAVA_ARCH" != "$PREFERED_ARCHITECTURE" ] ; then - JAVA_HOME_OTHER_ARCHITECTURE="$JAVA_HOME_TO_USE" - logger_warn "Prefered architecture is $PREFERED_ARCHITECTURE, java $JAVA_ARCH found in $JAVA_HOME_TO_USE, skip" - continue - fi - break + JAVA_HOME_OTHER_ARCHITECTURE="$JAVA_HOME_TO_USE" + logger_warn "Prefered architecture is $PREFERED_ARCHITECTURE, java $JAVA_ARCH found in $JAVA_HOME_TO_USE, skip" + continue + fi + break done if [ "$JAVA_HOME_TO_USE" = "" ] ; then - # Try to use the java in the system path - if ! type java >/dev/null ; then - # java not found in the system path - if [ "$JAVA_HOME_OTHER_ARCHITECTURE" != "" ] ; then - JAVA_HOME="$JAVA_HOME_OTHER_ARCHITECTURE" - JAVA="$JAVA_HOME/bin/java" - logger_warn "java $PREFERED_ARCHITECTURE not found in the system path, using $JAVA_HOME_OTHER_ARCHITECTURE" - else - logger_warn "java not found in the system" - exit 1 - fi - else - if [ "$(getJavaArchitecture $($WHICH java))" != "$PREFERED_ARCHITECTURE" ] ; then - logger_warn "java $PREFERED_ARCHITECTURE not found, using $($WHICH java)" - fi - unset JAVA_HOME - JAVA="java" - fi + # Try to use the java in the system path + if ! type java >/dev/null ; then + # java not found in the system path + if [ "$JAVA_HOME_OTHER_ARCHITECTURE" != "" ] ; then + JAVA_HOME="$JAVA_HOME_OTHER_ARCHITECTURE" + JAVA="$JAVA_HOME/bin/java" + logger_warn "java $PREFERED_ARCHITECTURE not found in the system path, using $JAVA_HOME_OTHER_ARCHITECTURE" + else + logger_warn "java not found in the system" + exit 1 + fi + else + if [ "$(getJavaArchitecture $($WHICH java))" != "$PREFERED_ARCHITECTURE" ] ; then + logger_warn "java $PREFERED_ARCHITECTURE not found, using $($WHICH java)" + fi + unset JAVA_HOME + JAVA="java" + fi else - JAVA_HOME="$JAVA_HOME_TO_USE" - JAVA="$JAVA_HOME/bin/java" + JAVA_HOME="$JAVA_HOME_TO_USE" + JAVA="$JAVA_HOME/bin/java" fi if [ "$PREFERED_ARCHITECTURE" = "x86" ] ; then @@ -301,18 +301,18 @@ add_library_path() { #logger_info "add_library_path $1" - LD_LIBRARY_PATH="$1{CPSEP}$LD_LIBRARY_PATH$" - GVSIG_NATIVE_LIBS="$1{CPSEP}$GVSIG_NATIVE_LIBS" - PATH="$1{CPSEP}$PATH$" + LD_LIBRARY_PATH="$LD_LIBRARY_PATH${CPSEP}$1" + GVSIG_NATIVE_LIBS="$GVSIG_NATIVE_LIBS${CPSEP}$1" + PATH="$1${CPSEP}$PATH" } list_shared_library_dependencies() { logger_info "Checking shared library dependencies for $1" if [ "$OS" = "win" ] ; then - logger_cmd ./cygcheck.exe "$1" + logger_cmd ./cygcheck.exe "\"$1"\" else - logger_cmd ldd "$1" - fi || logger_warn "Problens checking shared library $1" || true + logger_cmd ldd "$1" + fi || logger_warn "Problems checking shared library $1" || true } add_classpath() { @@ -357,7 +357,7 @@ export GVSIG_PARAMS # gvSIG initial classpath -export GVSIG_CLASSPATH="$LIBRARIES:$GVSIG_CLASSPATH" +export GVSIG_CLASSPATH="$LIBRARIES${CPSEP}$GVSIG_CLASSPATH" ######################## # Memory configuration # @@ -370,9 +370,9 @@ # Maximum permanent memory size: needed to load classes and statics export GVSIG_MAX_PERM_SIZE=${GVSIG_MAX_PERM_SIZE:-128M} -############################# -# Execute plugin's autorun # -############################# +############################ +# Execute plugin autoruns # +############################ for PLUGIN_FOLDER in "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/"* do @@ -397,9 +397,9 @@ DEBUG_ARGS="X${@}X" if expr match "$DEBUG_ARGS" "X.*--pause.*X" >/dev/null; then - DEBUG_PAUSE="y" + DEBUG_PAUSE="y" else - DEBUG_PAUSE="n" + DEBUG_PAUSE="n" fi if expr match "$DEBUG_ARGS" "X.*--debug.*X" >/dev/null; then