From bb708955bf43bb229440f03128920369668c3177 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 24 Jul 2025 14:29:02 +0200 Subject: [PATCH] Bug 39740: Replace DEV_INSTALL by GIT_INSTALL Content-Type: text/plain; charset=utf-8 Resulting from the following sed statement: git grep -l DEV_INSTALL | xargs sed -i -e "s/DEV_INSTALL/GIT_INSTALL/g" Test plan: Read the patch. The scripts will be tested later on. Signed-off-by: Marcel de Rooy --- debian/scripts/koha-elasticsearch | 2 +- debian/scripts/koha-es-indexer | 2 +- debian/scripts/koha-indexer | 2 +- debian/scripts/koha-plack | 6 +++--- debian/scripts/koha-rebuild-zebra | 2 +- debian/scripts/koha-reset-passwd | 2 +- debian/scripts/koha-sip | 2 +- debian/scripts/koha-sitemap | 2 +- debian/scripts/koha-upgrade-schema | 2 +- debian/scripts/koha-worker | 2 +- debian/scripts/koha-z3950-responder | 6 +++--- debian/templates/plack.psgi | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/scripts/koha-elasticsearch b/debian/scripts/koha-elasticsearch index bdd1d6f20e..05cda37fc6 100755 --- a/debian/scripts/koha-elasticsearch +++ b/debian/scripts/koha-elasticsearch @@ -84,7 +84,7 @@ run_rebuild_elasticsearch() # read instance name and eliminate instance name from params local name=$1; shift - if [ "$DEV_INSTALL" = "" ]; then + if [ "$GIT_INSTALL" = "" ]; then KOHA_BINDIR=${KOHA_HOME}/bin else KOHA_BINDIR=${KOHA_HOME}/misc diff --git a/debian/scripts/koha-es-indexer b/debian/scripts/koha-es-indexer index 5c61aee63b..0813db95d6 100755 --- a/debian/scripts/koha-es-indexer +++ b/debian/scripts/koha-es-indexer @@ -201,7 +201,7 @@ done # Optionally use alternative paths for a dev install adjust_paths_git_install $1 -if [ "$DEV_INSTALL" = "" ]; then +if [ "$GIT_INSTALL" = "" ]; then worker_DAEMON="${KOHA_HOME}/bin/workers/es_indexer_daemon.pl" else worker_DAEMON="${KOHA_HOME}/misc/workers/es_indexer_daemon.pl" diff --git a/debian/scripts/koha-indexer b/debian/scripts/koha-indexer index c0128c04bb..5bb3b5c66e 100755 --- a/debian/scripts/koha-indexer +++ b/debian/scripts/koha-indexer @@ -202,7 +202,7 @@ if [ ! -z "$ALTERNATE_INDEXER_DAEMON" ]; then INDEXER_DAEMON="$ALTERNATE_INDEXER_DAEMON" else # We default to rebuild_zebra.pl if no alternate indexer set - if [ "$DEV_INSTALL" = "" ]; then + if [ "$GIT_INSTALL" = "" ]; then INDEXER_DAEMON="${KOHA_HOME}/bin/migration_tools/rebuild_zebra.pl" else INDEXER_DAEMON="${KOHA_HOME}/misc/migration_tools/rebuild_zebra.pl" diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack index af34cefb69..badf7270de 100755 --- a/debian/scripts/koha-plack +++ b/debian/scripts/koha-plack @@ -99,7 +99,7 @@ start_plack() max_requests_and_workers="--max-requests ${PLACK_MAX_REQUESTS} --workers ${PLACK_WORKERS}" if [ "$debug_mode" = "yes" ]; then - # Maybe we should switch off debug_mode if DEV_INSTALL is not set? + # Maybe we should switch off debug_mode if GIT_INSTALL is not set? daemonize="" logging="" # remote debugger takes care max_requests_and_workers="--workers 1" @@ -365,7 +365,7 @@ _do_instance() { local name=$1 local PERL5LIB=$PERL5LIB local KOHA_HOME=$KOHA_HOME - local DEV_INSTALL=$DEV_INSTALL + local GIT_INSTALL=$GIT_INSTALL adjust_paths_git_install $name PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer @@ -476,7 +476,7 @@ done [ "${quiet}" != "yes" ] && check_env_and_warn export PERL5LIB -export DEV_INSTALL +export GIT_INSTALL export KOHA_HOME if [ $# -gt 0 ]; then diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra index 97195c2af2..10036d0f82 100755 --- a/debian/scripts/koha-rebuild-zebra +++ b/debian/scripts/koha-rebuild-zebra @@ -56,7 +56,7 @@ run_rebuild_zebra() [ "${full_reindex}" = "yes" ] || [ "${force}" = "yes" ] ; then - if [ "$DEV_INSTALL" = "" ]; then + if [ "$GIT_INSTALL" = "" ]; then KOHA_BINDIR=$KOHA_HOME/bin else KOHA_BINDIR=$KOHA_HOME/misc diff --git a/debian/scripts/koha-reset-passwd b/debian/scripts/koha-reset-passwd index f4408c0597..52f202e046 100755 --- a/debian/scripts/koha-reset-passwd +++ b/debian/scripts/koha-reset-passwd @@ -48,7 +48,7 @@ set_password() # Optionally use alternative paths for a dev install adjust_paths_git_install $1 - if [ "$DEV_INSTALL" = "" ]; then + if [ "$GIT_INSTALL" = "" ]; then KOHA_BINDIR=$KOHA_HOME/bin else KOHA_BINDIR=$KOHA_HOME/misc diff --git a/debian/scripts/koha-sip b/debian/scripts/koha-sip index 80855f309b..da11a08492 100755 --- a/debian/scripts/koha-sip +++ b/debian/scripts/koha-sip @@ -70,7 +70,7 @@ start_sip() adjust_paths_git_install $name export KOHA_HOME PERL5LIB - if [ "$DEV_INSTALL" = "" ]; then + if [ "$GIT_INSTALL" = "" ]; then LIBDIR=$KOHA_HOME/lib else LIBDIR=$KOHA_HOME diff --git a/debian/scripts/koha-sitemap b/debian/scripts/koha-sitemap index 0bd737ceb5..eaa2dd6b62 100755 --- a/debian/scripts/koha-sitemap +++ b/debian/scripts/koha-sitemap @@ -173,7 +173,7 @@ done # Optionally use alternative paths for a dev install adjust_paths_git_install $1 -if [ "$DEV_INSTALL" = "" ]; then +if [ "$GIT_INSTALL" = "" ]; then KOHA_BINDIR=$KOHA_HOME/bin else KOHA_BINDIR=$KOHA_HOME/misc diff --git a/debian/scripts/koha-upgrade-schema b/debian/scripts/koha-upgrade-schema index 6ab80e34b7..fc6aaf8326 100755 --- a/debian/scripts/koha-upgrade-schema +++ b/debian/scripts/koha-upgrade-schema @@ -31,7 +31,7 @@ fi # Optionally use alternative paths for a dev install adjust_paths_git_install $1 -if [ "$DEV_INSTALL" = "" ]; then +if [ "$GIT_INSTALL" = "" ]; then CGI_PATH=$KOHA_HOME/intranet/cgi-bin else CGI_PATH=$KOHA_HOME diff --git a/debian/scripts/koha-worker b/debian/scripts/koha-worker index 76f470e696..31abfdac41 100755 --- a/debian/scripts/koha-worker +++ b/debian/scripts/koha-worker @@ -214,7 +214,7 @@ done # Optionally use alternative paths for a dev install adjust_paths_git_install $1 -if [ "$DEV_INSTALL" = "" ]; then +if [ "$GIT_INSTALL" = "" ]; then worker_DAEMON="${KOHA_HOME}/bin/workers/background_jobs_worker.pl" else worker_DAEMON="${KOHA_HOME}/misc/workers/background_jobs_worker.pl" diff --git a/debian/scripts/koha-z3950-responder b/debian/scripts/koha-z3950-responder index 6064a05dad..79fe160908 100755 --- a/debian/scripts/koha-z3950-responder +++ b/debian/scripts/koha-z3950-responder @@ -85,7 +85,7 @@ start_z3950() daemonize="-D -d ${instancename}-koha-z3950" logging="-l /var/log/koha/${instancename}/z3950.log" - if [ "$DEV_INSTALL" = "1" ]; then + if [ "$GIT_INSTALL" = "1" ]; then MISCDIR=$KOHA_HOME/misc else MISCDIR=/usr/share/koha/bin @@ -93,7 +93,7 @@ start_z3950() Z3950RESPONDER="/usr/bin/perl $MISCDIR/z3950_responder.pl" if [ "$debug_mode" = "yes" ]; then - if [ "$DEV_INSTALL" = "1" ]; then + if [ "$GIT_INSTALL" = "1" ]; then warn "Not a dev install, disabling debug mode" else environment="development" @@ -303,7 +303,7 @@ if [ $# -gt 0 ]; then if is_instance $name; then adjust_paths_git_install $name - export DEV_INSTALL + export GIT_INSTALL export KOHA_HOME PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer # If debug mode is enabled, add the debugger lib path diff --git a/debian/templates/plack.psgi b/debian/templates/plack.psgi index 7dd49f3ae5..210a978673 100644 --- a/debian/templates/plack.psgi +++ b/debian/templates/plack.psgi @@ -53,15 +53,15 @@ use CGI qw(-utf8 ); # we will loose -utf8 under plack, otherwise my $home = $ENV{KOHA_HOME}; my $intranet = Plack::App::CGIBin->new( - root => $ENV{DEV_INSTALL}? $home: "$home/intranet/cgi-bin" + root => $ENV{GIT_INSTALL}? $home: "$home/intranet/cgi-bin" )->to_app; my $intranet_svc = Plack::App::CGIBin->new( - root => $ENV{DEV_INSTALL}? "$home/svc": "$home/intranet/cgi-bin/svc" + root => $ENV{GIT_INSTALL}? "$home/svc": "$home/intranet/cgi-bin/svc" )->to_app; my $opac = Plack::App::CGIBin->new( - root => $ENV{DEV_INSTALL}? "$home/opac": "$home/opac/cgi-bin/opac" + root => $ENV{GIT_INSTALL}? "$home/opac": "$home/opac/cgi-bin/opac" )->to_app; my $apiv1 = builder { -- 2.39.5