View | Details | Raw Unified | Return to bug 39740
Collapse All | Expand All

(-)a/debian/scripts/koha-functions.sh (-10 / +44 lines)
Lines 367-388 is_elasticsearch_enabled() Link Here
367
367
368
adjust_paths_dev_install()
368
adjust_paths_dev_install()
369
{
369
{
370
# Adjust KOHA_HOME, PERL5LIB for dev installs, as indicated by
370
# Adjust KOHA_HOME, PERL5LIB, KOHA_BINDIR for git installs
371
# corresponding tag in koha-conf.xml
372
371
373
    local instancename=$1
372
    local instancename=$1
374
    local dev_install=""
375
373
374
    if is_git_install $instancename; then
375
        KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir)
376
        PERL5LIB="$KOHA_HOME:$KOHA_HOME/lib"
377
        KOHA_BINDIR=misc
378
    else
379
        KOHA_BINDIR=bin
380
    fi
381
}
382
383
is_git_install()
384
{
385
    local instancename=$1 git_install
386
387
    # env var GIT_INSTALL overrules koha-conf entry
388
    if [ -n "$GIT_INSTALL" ]; then
389
        if [ "$GIT_INSTALL" != "0" ]; then return 0; else return 1; fi
390
    fi
391
392
    # now check koha-conf; looking at dev_install as historical fallback
376
    if [ "$instancename" != "" ] && is_instance $instancename; then
393
    if [ "$instancename" != "" ] && is_instance $instancename; then
377
        dev_install=$(run_safe_xmlstarlet $instancename dev_install)
394
        git_install=$(run_safe_xmlstarlet $instancename git_install)
395
        if [ -z "$git_install" ]; then git_install=$(run_safe_xmlstarlet $instancename dev_install); fi
378
    fi
396
    fi
397
    if [ -n "$git_install" ] && [ "$git_install" != "0" ]; then
398
        return 0; # true
399
    else
400
        return 1
401
    fi
402
}
379
403
380
    if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then
404
is_test_system()
381
        DEV_INSTALL=1
405
{
382
        KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir)
406
    local instancename=$1 test_system
383
        PERL5LIB="$KOHA_HOME:$KOHA_HOME/lib"
407
408
    # env var TEST_SYSTEM overrules koha-conf entry
409
    if [ -n "$TEST_SYSTEM" ]; then
410
        if [ "$TEST_SYSTEM" != "0" ]; then return 0; else return 1; fi
411
    fi
412
413
    # now check koha-conf
414
    if [ "$instancename" != "" ] && is_instance $instancename; then
415
        test_system=$(run_safe_xmlstarlet $instancename test_system)
416
    fi
417
    if [ -n "$test_system" ] && [ "test_system" != "0" ]; then
418
        return 0; # true
384
    else
419
    else
385
        DEV_INSTALL=""
420
        return 1
386
    fi
421
    fi
387
}
422
}
388
423
389
- 

Return to bug 39740