Revision 42932

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/tools/make-portable
221 221
    cd $BASEFOLDER/standard
222 222

  
223 223
    export PORTABLE_OS="$1"
224
    echo $PORTABLE_OS
224
    export PORTABLE_OSNAME="$2"
225
    export PORTABLE_PLATFORM="$3"
225 226

  
226
    if [ $PORTABLE_OS == "darwin_macos_10.11" ]
227
    then
227
    export ONLINE_OS="$PORTABLE_OSNAME"
228
    if [ "$PORTABLE_OSNAME" == "darwin" ] ; then
228 229
	export ONLINE_OS="lin"
229
    elif [ $PORTABLE_OS == "lin_ubuntu_16.04" ]
230
    then
231
	export ONLINE_OS="lin"
232
    else
233
	export ONLINE_OS="$PORTABLE_OS"
234 230
    fi
235 231

  
236
    export PORTABLE_OSNAME="$2"
237
    export PORTABLE_PLATFORM="$3"
238 232
    export PORTABLE_VERSION=$(expr *${ONLINE_OS}-${PORTABLE_PLATFORM}-online.zip : "gvSIG-desktop-\\([0-9.]*-[0-9]*\\)")
239 233
    export PORTABLE_STATUS=$(expr *${ONLINE_OS}-${PORTABLE_PLATFORM}-online.zip : "gvSIG-desktop-[0-9.]*-[0-9]*-\\([a-zA-Z]*[0-9]*\)")
240 234
    export PORTABLE_NAME="gvSIG-desktop-$PORTABLE_VERSION-${PORTABLE_STATUS}-${PORTABLE_OS}-${PORTABLE_PLATFORM}"
......
278 272

  
279 273
    run_plugins_install_scripts $INSTALL_FOLDER
280 274

  
275
    if [ "$PORTABLE_OSNAME" == "darwin" ] ; then
276
        mkdir "$INSTALL_FOLDER/Contents"
277
        mkdir "$INSTALL_FOLDER/Contents/MacOS"
278
        echo '#!/bin/bash
279
x=$(dirname $0)
280
x=$(dirname $x)
281
x=$(dirname $x)
282
exec "$x/gvSIG.sh"
283
' >"$INSTALL_FOLDER/Contents/MacOS/${PORTABLE_NAME}"
284
        chmod a+x "$INSTALL_FOLDER/Contents/MacOS/${PORTABLE_NAME}"
285
        mv "$INSTALL_FOLDER" "${INSTALL_FOLDER}.app"
286
        INSTALL_FOLDER="${INSTALL_FOLDER}.app"
287
        PORTABLE_NAME="${PORTABLE_NAME}.app"
288
    fi
289

  
281 290
    logger_info "Compresing ${PORTABLE_OSNAME}-${PORTABLE_PLATFORM} portable (this take a moment)"
282 291
    cd "$TARGET"
283 292
    zipfolder "${PORTABLE_NAME}.zip" "${PORTABLE_NAME}"

Also available in: Unified diff