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

(-)a/debian/scripts/koha-elasticsearch (-1 / +1 lines)
Lines 84-90 run_rebuild_elasticsearch() Link Here
84
    # read instance name and eliminate instance name from params
84
    # read instance name and eliminate instance name from params
85
    local name=$1; shift
85
    local name=$1; shift
86
86
87
    if [ "$DEV_INSTALL" = "" ]; then
87
    if [ "$GIT_INSTALL" = "" ]; then
88
        KOHA_BINDIR=${KOHA_HOME}/bin
88
        KOHA_BINDIR=${KOHA_HOME}/bin
89
    else
89
    else
90
        KOHA_BINDIR=${KOHA_HOME}/misc
90
        KOHA_BINDIR=${KOHA_HOME}/misc
(-)a/debian/scripts/koha-es-indexer (-1 / +1 lines)
Lines 201-207 done Link Here
201
# Optionally use alternative paths for a dev install
201
# Optionally use alternative paths for a dev install
202
adjust_paths_git_install $1
202
adjust_paths_git_install $1
203
203
204
if [ "$DEV_INSTALL" = "" ]; then
204
if [ "$GIT_INSTALL" = "" ]; then
205
    worker_DAEMON="${KOHA_HOME}/bin/workers/es_indexer_daemon.pl"
205
    worker_DAEMON="${KOHA_HOME}/bin/workers/es_indexer_daemon.pl"
206
else
206
else
207
    worker_DAEMON="${KOHA_HOME}/misc/workers/es_indexer_daemon.pl"
207
    worker_DAEMON="${KOHA_HOME}/misc/workers/es_indexer_daemon.pl"
(-)a/debian/scripts/koha-indexer (-1 / +1 lines)
Lines 202-208 if [ ! -z "$ALTERNATE_INDEXER_DAEMON" ]; then Link Here
202
    INDEXER_DAEMON="$ALTERNATE_INDEXER_DAEMON"
202
    INDEXER_DAEMON="$ALTERNATE_INDEXER_DAEMON"
203
else
203
else
204
    # We default to rebuild_zebra.pl if no alternate indexer set
204
    # We default to rebuild_zebra.pl if no alternate indexer set
205
    if [ "$DEV_INSTALL" = "" ]; then
205
    if [ "$GIT_INSTALL" = "" ]; then
206
        INDEXER_DAEMON="${KOHA_HOME}/bin/migration_tools/rebuild_zebra.pl"
206
        INDEXER_DAEMON="${KOHA_HOME}/bin/migration_tools/rebuild_zebra.pl"
207
    else
207
    else
208
        INDEXER_DAEMON="${KOHA_HOME}/misc/migration_tools/rebuild_zebra.pl"
208
        INDEXER_DAEMON="${KOHA_HOME}/misc/migration_tools/rebuild_zebra.pl"
(-)a/debian/scripts/koha-plack (-3 / +3 lines)
Lines 99-105 start_plack() Link Here
99
    max_requests_and_workers="--max-requests ${PLACK_MAX_REQUESTS} --workers ${PLACK_WORKERS}"
99
    max_requests_and_workers="--max-requests ${PLACK_MAX_REQUESTS} --workers ${PLACK_WORKERS}"
100
100
101
    if [ "$debug_mode" = "yes" ]; then
101
    if [ "$debug_mode" = "yes" ]; then
102
        # Maybe we should switch off debug_mode if DEV_INSTALL is not set?
102
        # Maybe we should switch off debug_mode if GIT_INSTALL is not set?
103
        daemonize=""
103
        daemonize=""
104
        logging="" # remote debugger takes care
104
        logging="" # remote debugger takes care
105
        max_requests_and_workers="--workers 1"
105
        max_requests_and_workers="--workers 1"
Lines 365-371 _do_instance() { Link Here
365
    local name=$1
365
    local name=$1
366
    local PERL5LIB=$PERL5LIB
366
    local PERL5LIB=$PERL5LIB
367
    local KOHA_HOME=$KOHA_HOME
367
    local KOHA_HOME=$KOHA_HOME
368
    local DEV_INSTALL=$DEV_INSTALL
368
    local GIT_INSTALL=$GIT_INSTALL
369
369
370
    adjust_paths_git_install $name
370
    adjust_paths_git_install $name
371
    PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
371
    PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
Lines 476-482 done Link Here
476
[ "${quiet}" != "yes" ] && check_env_and_warn
476
[ "${quiet}" != "yes" ] && check_env_and_warn
477
477
478
export PERL5LIB
478
export PERL5LIB
479
export DEV_INSTALL
479
export GIT_INSTALL
480
export KOHA_HOME
480
export KOHA_HOME
481
481
482
if [ $# -gt 0 ]; then
482
if [ $# -gt 0 ]; then
(-)a/debian/scripts/koha-rebuild-zebra (-1 / +1 lines)
Lines 56-62 run_rebuild_zebra() Link Here
56
       [     "${full_reindex}" = "yes" ] ||
56
       [     "${full_reindex}" = "yes" ] ||
57
       [            "${force}" = "yes" ] ; then
57
       [            "${force}" = "yes" ] ; then
58
58
59
        if [ "$DEV_INSTALL" = "" ]; then
59
        if [ "$GIT_INSTALL" = "" ]; then
60
            KOHA_BINDIR=$KOHA_HOME/bin
60
            KOHA_BINDIR=$KOHA_HOME/bin
61
        else
61
        else
62
            KOHA_BINDIR=$KOHA_HOME/misc
62
            KOHA_BINDIR=$KOHA_HOME/misc
(-)a/debian/scripts/koha-reset-passwd (-1 / +1 lines)
Lines 48-54 set_password() Link Here
48
    # Optionally use alternative paths for a dev install
48
    # Optionally use alternative paths for a dev install
49
    adjust_paths_git_install $1
49
    adjust_paths_git_install $1
50
50
51
    if [ "$DEV_INSTALL" = "" ]; then
51
    if [ "$GIT_INSTALL" = "" ]; then
52
        KOHA_BINDIR=$KOHA_HOME/bin
52
        KOHA_BINDIR=$KOHA_HOME/bin
53
    else
53
    else
54
        KOHA_BINDIR=$KOHA_HOME/misc
54
        KOHA_BINDIR=$KOHA_HOME/misc
(-)a/debian/scripts/koha-sip (-1 / +1 lines)
Lines 70-76 start_sip() Link Here
70
            adjust_paths_git_install $name
70
            adjust_paths_git_install $name
71
            export KOHA_HOME PERL5LIB
71
            export KOHA_HOME PERL5LIB
72
72
73
            if [ "$DEV_INSTALL" = "" ]; then
73
            if [ "$GIT_INSTALL" = "" ]; then
74
                LIBDIR=$KOHA_HOME/lib
74
                LIBDIR=$KOHA_HOME/lib
75
            else
75
            else
76
                LIBDIR=$KOHA_HOME
76
                LIBDIR=$KOHA_HOME
(-)a/debian/scripts/koha-sitemap (-1 / +1 lines)
Lines 173-179 done Link Here
173
173
174
# Optionally use alternative paths for a dev install
174
# Optionally use alternative paths for a dev install
175
adjust_paths_git_install $1
175
adjust_paths_git_install $1
176
if [ "$DEV_INSTALL" = "" ]; then
176
if [ "$GIT_INSTALL" = "" ]; then
177
    KOHA_BINDIR=$KOHA_HOME/bin
177
    KOHA_BINDIR=$KOHA_HOME/bin
178
else
178
else
179
    KOHA_BINDIR=$KOHA_HOME/misc
179
    KOHA_BINDIR=$KOHA_HOME/misc
(-)a/debian/scripts/koha-upgrade-schema (-1 / +1 lines)
Lines 31-37 fi Link Here
31
31
32
# Optionally use alternative paths for a dev install
32
# Optionally use alternative paths for a dev install
33
adjust_paths_git_install $1
33
adjust_paths_git_install $1
34
if [ "$DEV_INSTALL" = "" ]; then
34
if [ "$GIT_INSTALL" = "" ]; then
35
    CGI_PATH=$KOHA_HOME/intranet/cgi-bin
35
    CGI_PATH=$KOHA_HOME/intranet/cgi-bin
36
else
36
else
37
    CGI_PATH=$KOHA_HOME
37
    CGI_PATH=$KOHA_HOME
(-)a/debian/scripts/koha-worker (-1 / +1 lines)
Lines 214-220 done Link Here
214
# Optionally use alternative paths for a dev install
214
# Optionally use alternative paths for a dev install
215
adjust_paths_git_install $1
215
adjust_paths_git_install $1
216
216
217
if [ "$DEV_INSTALL" = "" ]; then
217
if [ "$GIT_INSTALL" = "" ]; then
218
    worker_DAEMON="${KOHA_HOME}/bin/workers/background_jobs_worker.pl"
218
    worker_DAEMON="${KOHA_HOME}/bin/workers/background_jobs_worker.pl"
219
else
219
else
220
    worker_DAEMON="${KOHA_HOME}/misc/workers/background_jobs_worker.pl"
220
    worker_DAEMON="${KOHA_HOME}/misc/workers/background_jobs_worker.pl"
(-)a/debian/scripts/koha-z3950-responder (-3 / +3 lines)
Lines 85-91 start_z3950() Link Here
85
    daemonize="-D -d ${instancename}-koha-z3950"
85
    daemonize="-D -d ${instancename}-koha-z3950"
86
    logging="-l /var/log/koha/${instancename}/z3950.log"
86
    logging="-l /var/log/koha/${instancename}/z3950.log"
87
87
88
    if [ "$DEV_INSTALL" = "1" ]; then
88
    if [ "$GIT_INSTALL" = "1" ]; then
89
        MISCDIR=$KOHA_HOME/misc
89
        MISCDIR=$KOHA_HOME/misc
90
    else
90
    else
91
        MISCDIR=/usr/share/koha/bin
91
        MISCDIR=/usr/share/koha/bin
Lines 93-99 start_z3950() Link Here
93
93
94
    Z3950RESPONDER="/usr/bin/perl $MISCDIR/z3950_responder.pl"
94
    Z3950RESPONDER="/usr/bin/perl $MISCDIR/z3950_responder.pl"
95
    if [ "$debug_mode" = "yes" ]; then
95
    if [ "$debug_mode" = "yes" ]; then
96
        if [ "$DEV_INSTALL" = "1" ]; then
96
        if [ "$GIT_INSTALL" = "1" ]; then
97
            warn "Not a dev install, disabling debug mode"
97
            warn "Not a dev install, disabling debug mode"
98
        else
98
        else
99
            environment="development"
99
            environment="development"
Lines 303-309 if [ $# -gt 0 ]; then Link Here
303
        if is_instance $name; then
303
        if is_instance $name; then
304
304
305
            adjust_paths_git_install $name
305
            adjust_paths_git_install $name
306
            export DEV_INSTALL
306
            export GIT_INSTALL
307
            export KOHA_HOME
307
            export KOHA_HOME
308
            PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
308
            PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer
309
            # If debug mode is enabled, add the debugger lib path
309
            # If debug mode is enabled, add the debugger lib path
(-)a/debian/templates/plack.psgi (-4 / +3 lines)
Lines 53-67 use CGI qw(-utf8 ); # we will loose -utf8 under plack, otherwise Link Here
53
53
54
my $home = $ENV{KOHA_HOME};
54
my $home = $ENV{KOHA_HOME};
55
my $intranet = Plack::App::CGIBin->new(
55
my $intranet = Plack::App::CGIBin->new(
56
    root => $ENV{DEV_INSTALL}? $home: "$home/intranet/cgi-bin"
56
    root => $ENV{GIT_INSTALL}? $home: "$home/intranet/cgi-bin"
57
)->to_app;
57
)->to_app;
58
58
59
my $intranet_svc = Plack::App::CGIBin->new(
59
my $intranet_svc = Plack::App::CGIBin->new(
60
    root => $ENV{DEV_INSTALL}? "$home/svc": "$home/intranet/cgi-bin/svc"
60
    root => $ENV{GIT_INSTALL}? "$home/svc": "$home/intranet/cgi-bin/svc"
61
)->to_app;
61
)->to_app;
62
62
63
my $opac = Plack::App::CGIBin->new(
63
my $opac = Plack::App::CGIBin->new(
64
    root => $ENV{DEV_INSTALL}? "$home/opac": "$home/opac/cgi-bin/opac"
64
    root => $ENV{GIT_INSTALL}? "$home/opac": "$home/opac/cgi-bin/opac"
65
)->to_app;
65
)->to_app;
66
66
67
my $apiv1  = builder {
67
my $apiv1  = builder {
68
- 

Return to bug 39740