Revision 42297

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh
78 78 
#################################
79 79 

  		




  80
  80
  
    
# Go into the gvSIG installation folder, just in case


  		




  81
  
  
    
cd "$(dirname $0)"


  		




  
  81
  
    
x=$(dirname "$0")


  		




  
  82
  
    
cd "$x"


  		




  82
  83
  
    

  		




  83
  84
  
    
if [ "$GVSIG_APPLICATION_NAME" = "" ] ; then


  		




  84
  85
  
    
  GVSIG_APPLICATION_NAME=gvSIG


  		




  ......




  150
  151
  
    

  		




  151
  152
  
    
cd "$GVSIG_INSTALL_FOLDER"


  		




  152
  153
  
    
x=$(find "./gvSIG/extensiones" -name package.info)


  		




  153
  
  
    
x=$(grep -h "architecture=[^a]" $x | sort|head -n 1)


  		




  
  154
  
    
x=$(grep -h "architecture=[^a]" "$x" | sort|head -n 1)


  		




  154
  155
  
    
if [ "X${x}X" != "XX" ] ; then


  		




  155
  156
  
    
	eval $x


  		




  156
  157
  
    
	PREFERED_ARCHITECTURE="$architecture"


  		




  ......




  208
  209
  
    
                logger_warn "Not a valid JAVA_HOME ($JAVA_HOME_TO_USE), bin/java not found, skip"


  		




  209
  210
  
    
                continue


  		




  210
  211
  
    
        fi


  		




  211
  
  
    
	JAVA_ARCH="$(getJavaArchitecture $JAVA_HOME_TO_USE/bin/java)"


  		




  
  212
  
    
	JAVA_ARCH=$(getJavaArchitecture "$JAVA_HOME_TO_USE/bin/java")


  		




  212
  213
  
    
	if [ "$JAVA_ARCH" != "$PREFERED_ARCHITECTURE" ] ; then


  		




  213
  214
  
    
                JAVA_HOME_OTHER_ARCHITECTURE="$JAVA_HOME_TO_USE"


  		




  214
  215
  
    
                logger_warn "Prefered architecture is $PREFERED_ARCHITECTURE, java $JAVA_ARCH found in $JAVA_HOME_TO_USE, skip"


  		












Also available in:  Unified diff