Revision 42386

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh
1
#!/bin/sh
1
#!/bin/bash
2 2
#
3 3
# gvSIG. Desktop Geographic Information System.
4 4
#
......
25 25

  
26 26
# gvSIG.sh
27 27

  
28
set -e
29 28
#set -x
30 29

  
30

  
31
onerror() {
32
  set +x
33
  echo "Error executing the command:"
34
  echo ">>> $BASH_COMMAND <<<"
35
  echo "At line $BASH_LINENO"
36
  exit 1
37
}
38
trap onerror ERR
39

  
31 40
####################
32 41
# Identify OS and Architecture  #
33 42
####################
......
152 161
# Note: Busybox n windows don't support -exec in find
153 162
##########################################################
154 163

  
155
cd "$GVSIG_INSTALL_FOLDER"
156
find . -name package.info | while read fname
157
do
158
  cat $fname
159
done | grep "architecture=[^a]" | sort | head -n 1 | read x
160
if [ "X${x}X" != "XX" ] ; then
161
	eval $x
162
	PREFERED_ARCHITECTURE="$architecture"
163
else
164
	PREFERED_ARCHITECTURE="$ARCH"
165
fi
166
cd - >/dev/null
164
setPreferedArchitecture() {
165
  local foundArch=""
166
  local fname
167
  cd "$GVSIG_INSTALL_FOLDER"
168
  find . -name package.info | while read fname
169
  do
170
    cat $fname
171
  done | grep "architecture=[^a]" | sort | head -n 1 | read foundArch || true
172
  # El comando "read x" de la linea anterior puede fallar si 
173
  # no hay ningun plugin depdendiente de la arquitectura, por eso 
174
  # el "|| true" del final.
175
  if [ "X${foundArch}X" != "XX" ] ; then
176
	  eval $foundArch
177
	  PREFERED_ARCHITECTURE="$architecture"
178
  else
179
	  PREFERED_ARCHITECTURE="$ARCH"
180
  fi
181
  cd - >/dev/null
182
}
167 183

  
184
setPreferedArchitecture
185

  
168 186
##########################################################
169 187

  
188
export JAVA_HOME
189
export JAVA
190
export FORCE_JAVA_32BITS
191

  
170 192
FORCE_JAVA_32BITS=""
171 193
JAVA_HOME_OTHER_ARCHITECTURE=""
172 194

  
......
195 217
# 3. Java in the HOME/gvsig/jre folder (optionally created during installation process)
196 218
# 4. Java in the system path.
197 219
#
198
export JAVA_HOME
199
export JAVA
200
export FORCE_JAVA_32BITS
201 220

  
202

  
203 221
for JAVA_HOME_TO_USE in "$JAVA_HOME" "$DEFAULT_JAVA_HOME" "$PJH1" "$PJH2" "$PJH3" "$PJH4" "$PJH5" $PJH6 ""
204 222
do
205 223
        if [ "$JAVA_HOME_TO_USE" = "" ] ; then
......
269 287

  
270 288
list_shared_library_dependencies() {
271 289
  logger_info "Cheking shared library dependencies for $1"
272
  set +e
273 290
  if [ "$OS" = "win" ] ; then
274
        logger_cmd cygcheck.exe "$1"
291
        logger_cmd cygcheck.exe "$1" || true
275 292
  else
276
        logger_cmd ldd "$1"
277
  fi || logger_warn "Problens checking shared library $1"
278
  set -e
293
        logger_cmd ldd "$1" || true
294
  fi || logger_warn "Problens checking shared library $1" 
279 295
}
280 296

  
281 297
###################################################################

Also available in: Unified diff