Revision 43263

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh
61 61
# Identify OS and Architecture  #
62 62
####################
63 63

  
64
UNAME=$(uname -m -o | tr '[:upper:]' '[:lower:]')
64
UNAME=$(uname -m -o -s | tr '[:upper:]' '[:lower:]')
65
# Use -s to identify cygwin
65 66
case "$UNAME" in
67
*cygwin*)
68
    OS="win"
69
    ARG_D32=""
70
    CPSEP=";"
71
    CYGWIN="yes"
72
    ;;
66 73
*darwin*)
67 74
    OS="darwin"
68 75
    ARG_D32=""
69 76
    CPSEP=":"
77
    CYGWIN="no"
70 78
    ;;
71 79
*win*)
72 80
    OS="win"
73 81
    ARG_D32=""
74 82
    CPSEP=";"
83
    CYGWIN="no"
75 84
    ;;
76 85
*lin*)
77 86
    OS="lin"
78 87
    # Only linux support -d32 arg
79 88
    ARG_D32="-d32"
80 89
    CPSEP=":"
90
    CYGWIN="no"
81 91
    ;;
82 92
*)
83 93
    OS="unknown"
84 94
    ARG_D32=""
85 95
    CPSEP=":"
96
    CYGWIN="no"
86 97
    ;;
87 98
esac
99

  
88 100
case "$UNAME" in
89 101
*x86_64*)
90 102
    ARCH="x86_64"
......
156 168
fi
157 169
export GVSIG_APPLICATION_NAME
158 170

  
159
# gvSIG installation folder
160
export GVSIG_INSTALL_FOLDER="$PWD"
161

  
162
# gvSIG home folder
163
if [ "$OS" = "win" ] ; then
164
  # https://redmine.gvsig.net/redmine/issues/4033
165
  export GVSIG_HOME_FOLDER="$USERPROFILE/$GVSIG_APPLICATION_NAME"
171
# gvSIG installation and home folder
172
if [ "$CYGWIN" = "yes" ] ; then
173
  # gvSIG installation folder
174
  export GVSIG_INSTALL_FOLDER=$(./cygpath -am "$PWD")
175
  # gvSIG home folder
176
  export GVSIG_HOME_FOLDER=$(./cygpath -am "$USERPROFILE/$GVSIG_APPLICATION_NAME")
166 177
else
167
  export GVSIG_HOME_FOLDER="$HOME/$GVSIG_APPLICATION_NAME"
178
  # gvSIG installation folder
179
  export GVSIG_INSTALL_FOLDER="$PWD"
180
  # gvSIG home folder
181
  if [ "$OS" = "win" ] ; then
182
    # https://redmine.gvsig.net/redmine/issues/4033
183
    export GVSIG_HOME_FOLDER="$USERPROFILE/$GVSIG_APPLICATION_NAME"
184
  else
185
    export GVSIG_HOME_FOLDER="$HOME/$GVSIG_APPLICATION_NAME"
186
  fi
168 187
fi
169 188

  
170 189
####################
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/org.gvsig.desktop.installer.izpack/org.gvsig.desktop.installer.izpack.win.x86_64/src/main/scripts/prepare_win.groovy
21 21

  
22 22
    log.info("Download busybox.exe")
23 23
    helper.ant.get(
24
      src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/x86/busybox.exe",
24
      src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/x64/busybox.exe",
25 25
      dest: new File(target,"busybox.exe").getAbsolutePath()
26 26
    )
27
    log.info("Download cygwin1.dll")
28
    helper.ant.get(
29
      src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/x64/cygwin1.dll",
30
      dest: new File(target,"cygwin1.dll").getAbsolutePath()
31
    )
32
    log.info("Download cygpath.exe")
33
    helper.ant.get(
34
      src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/x64/cygpath.exe",
35
      dest: new File(target,"cygpath.exe").getAbsolutePath()
36
    )
27 37

  
28 38
    log.info("Download cygcheck.exe ")
29 39
    helper.ant.get(

Also available in: Unified diff