Revision 42992

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/tools/make-portable
51 51
export PATCHSFOLDER=$BASEFOLDER/patchs
52 52

  
53 53
function logger_info() {
54
    echo $*
54
    echo "$*"
55 55
}
56 56

  
57 57
function logger_warn() {
58
    echo $*
58
    echo "$*"
59 59
}
60 60

  
61 61
function get_package_info() {
......
269 269
    # OS code (lin/win/darwin) + distribution + version
270 270
    export PORTABLE_OS="$1"
271 271

  
272
    # OS family code (lin/win/darwin)
273
    export PORTABLE_OSFAMILY="${PORTABLE_OS/_*/}"
274

  
272 275
    # OS name (linux/windows/darwin) for show only
273 276
    export PORTABLE_OSNAME="$2"
274 277

  
......
277 280

  
278 281
    # OS used to locate the online zip
279 282
    export ONLINE_OS
280
    case "$PORTABLE_OSNAME" in
283
    case "$PORTABLE_OSFAMILY" in
281 284
    darwin)
282 285
        ONLINE_OS="lin"
283 286
        ;;
284
    linux)
287
    lin)
285 288
        ONLINE_OS="lin"
286 289
        ;;
287
    windows)
290
    win)
288 291
        ONLINE_OS="win"
289 292
        ;;
290 293
    *)
......
298 301

  
299 302
    export INSTALL_FOLDER="$TARGET/$PORTABLE_NAME"
300 303

  
304
    logger_info "
305
=
306
=    Creating portable for ${PORTABLE_OSNAME} (${PORTABLE_OSFAMILY}/${PORTABLE_OS}/${PORTABLE_PLATFORM} - online os ${ONLINE_OS})
307
=
308
    "
301 309
    logger_info "Removing previous files"
302 310
    rm -rf "$TARGET/gvsig-desktop"
303 311
    rm -rf "$INSTALL_FOLDER"
304 312
    rm -f  "$TARGET/${PORTABLE_NAME}.zip"
305 313
    rm -rf "$TARGET/packages-${PORTABLE_OS}-${PORTABLE_PLATFORM}"
306 314

  
307
    logger_info "Uncompressing ${PORTABLE_OSNAME} base files"
315
    logger_info "Uncompressing ${PORTABLE_OSNAME} (${ONLINE_OS}) base files"
308 316
    cd $TARGET
309 317
    mkdir $PORTABLE_NAME
310 318
    cd $PORTABLE_NAME
......
335 343

  
336 344
    run_plugins_install_scripts $INSTALL_FOLDER
337 345

  
338
    case "$PORTABLE_OS" in
346
    case "$PORTABLE_OSFAMILY" in
339 347
    darwin)
340 348
        mkdir "$INSTALL_FOLDER/Contents"
341 349
        mkdir "$INSTALL_FOLDER/Contents/MacOS"
......
364 372
    logger_info "Removing temporary package folder"
365 373
    rm -rf $TARGET/packages-${PORTABLE_OS}-${PORTABLE_PLATFORM}
366 374

  
367
    logger_info "${PORTABLE_OSNAME}-${PORTABLE_PLATFORM} portable created."
375
    logger_info "
376

  
377
    Portable ${PORTABLE_OSNAME}-${PORTABLE_PLATFORM} created.
378

  
379
    "
368 380
}
369 381

  
370 382

  
371 383
function main() {
384
    mkdist darwin_macos_10.11 darwin x86_64
372 385
    mkdist win windows x86
373
    mkdist darwin_macos_10.11 darwin x86_64
374 386
    mkdist lin_ubuntu_16.04 linux x86_64
375 387
    mkdist lin linux x86
376 388
    mkdist lin linux x86_64
......
379 391
}
380 392

  
381 393
mkdir -p "$TARGET"
382
main | tee "$TARGET/${SCRIPT_NAME}.log"
394
main | tee "$TARGET/${SCRIPT_NAME}.log""

Also available in: Unified diff