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

View differences:

gvSIG.sh
37 37
	OS="win"
38 38
	ARG_D32=""
39 39
        CPSEP=";"
40
else 
40
else
41 41
	if echo "$UNAME" | grep -i "lin" >/dev/null ; then
42 42
		OS="lin"
43 43
		# Only linux support -d32 arg
......
59 59

  
60 60
getJavaArchitecture() {
61 61
	if [ "$ARCH" = "x86" ] ; then
62
                # Si la arquitectura del SO es x86 decimos 
62
                # Si la arquitectura del SO es x86 decimos
63 63
                # que la de java es x86
64 64
		echo "x86"
65 65
	else
......
70 70
		else
71 71
			echo "x86"
72 72
		fi
73
	fi 
73
	fi
74 74
}
75 75

  
76 76
#################################
......
137 137
logger_info "gvSIG home folder: $GVSIG_HOME_FOLDER"
138 138

  
139 139
##########################################################
140
# Search in gvSIG/extensiones the architecture of plugins 
140
# Search in gvSIG/extensiones the architecture of plugins
141 141
# installeds and set as PREFERED_ARCHITECTURE
142 142
##########################################################
143 143

  
......
236 236

  
237 237
if [ "$PREFERED_ARCHITECTURE" = "x86" ] ; then
238 238
	FORCE_JAVA_32BITS="$ARG_D32"
239
else 
239
else
240 240
	FORCE_JAVA_32BITS=""
241 241

  
242 242
fi
......
247 247
###################################################################
248 248

  
249 249
export GVSIG_NATIVE_LIBS=""
250
export LD_LIBRARY_PATH=""
250 251

  
251 252
add_library_path() {
252 253
  LD_LIBRARY_PATH="$LD_LIBRARY_PATH${CPSEP}$1"
......
264 265
###################################################################
265 266

  
266 267
export LIBRARIES=""
267
# Load gvSIG Andami jars and dependencies for the classpath 
268
# Load gvSIG Andami jars and dependencies for the classpath
268 269
for i in "$GVSIG_INSTALL_FOLDER/lib/"*.jar ; do
269 270
  if [ "$i" != "$GVSIG_INSTALL_FOLDER/lib/*.jar" -a "$i" != "" ]; then
270 271
    LIBRARIES="${LIBRARIES}${CPSEP}${i}"
271
  fi 
272
  fi
272 273
done
273 274
for i in "$GVSIG_INSTALL_FOLDER/lib/"*.zip ; do
274 275
  if [ "$i" != "$GVSIG_INSTALL_FOLDER/lib/*.zip" -a "$i" != "" ]; then
275 276
    LIBRARIES="${LIBRARIES}${CPSEP}${i}"
276
  fi 
277
  fi
277 278
done
278 279

  
279 280
# echo Initial libraries found: ${LIBRARIES}
......
309 310
# Execute plugin's autorun  #
310 311
#############################
311 312

  
312
for PLUGIN_FOLDER in "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/"* 
313
for PLUGIN_FOLDER in "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/"*
313 314
do
314 315
  if [ -f "$PLUGIN_FOLDER/autorun.sh" ] ; then
315 316
    logger_info "Running autorun from plugin " $(basename "$PLUGIN_FOLDER")
......
325 326
#####################
326 327

  
327 328
DEBUG_ARGS="X${@}X"
328
if expr match "$DEBUG_ARGS" "X.*--pause.*X" >/dev/null; then           
329
if expr match "$DEBUG_ARGS" "X.*--pause.*X" >/dev/null; then
329 330
    DEBUG_PAUSE="y"
330 331
else
331 332
    DEBUG_PAUSE="n"
332 333
fi
333 334

  
334
if expr match "$DEBUG_ARGS" "X.*--debug.*X" >/dev/null; then           
335
if expr match "$DEBUG_ARGS" "X.*--debug.*X" >/dev/null; then
335 336
  DEBUG_OPTIONS="-agentlib:jdwp=transport=dt_socket,address=8765,server=y,suspend=$DEBUG_PAUSE"
336 337
else
337 338
  DEBUG_OPTIONS=""

Also available in: Unified diff