From b2fed3e24dc6717cd6dcd2b354b2056a2edc66fa Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 24 Jul 2025 13:37:48 +0200 Subject: [PATCH] Bug 39740: Rename function to adjust_paths_git_install Logical follow-up for moving away from dev_install to git_install. Result of running git grep -l adjust_paths_dev_install | xargs sed -i -e "s/adjust_paths_dev_install/adjust_paths_git_install/g" Test plan: Read the patch. The scripts will be tested later on. Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- debian/scripts/koha-elasticsearch | 2 +- debian/scripts/koha-es-indexer | 2 +- debian/scripts/koha-functions.sh | 2 +- debian/scripts/koha-indexer | 2 +- debian/scripts/koha-plack | 2 +- 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-translate | 2 +- debian/scripts/koha-upgrade-schema | 2 +- debian/scripts/koha-worker | 2 +- debian/scripts/koha-z3950-responder | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/scripts/koha-elasticsearch b/debian/scripts/koha-elasticsearch index f337b8fa71e..bdd1d6f20e5 100755 --- a/debian/scripts/koha-elasticsearch +++ b/debian/scripts/koha-elasticsearch @@ -178,7 +178,7 @@ while [ -n "$*" ]; do done # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 # Parse command line. if [ $# -lt 1 ]; then diff --git a/debian/scripts/koha-es-indexer b/debian/scripts/koha-es-indexer index 29d78f9664e..5c61aee63b7 100755 --- a/debian/scripts/koha-es-indexer +++ b/debian/scripts/koha-es-indexer @@ -199,7 +199,7 @@ while [ $# -gt 0 ]; do done # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 if [ "$DEV_INSTALL" = "" ]; then worker_DAEMON="${KOHA_HOME}/bin/workers/es_indexer_daemon.pl" diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh index c120c2eb424..367260a4291 100755 --- a/debian/scripts/koha-functions.sh +++ b/debian/scripts/koha-functions.sh @@ -365,7 +365,7 @@ is_elasticsearch_enabled() fi } -adjust_paths_dev_install() +adjust_paths_git_install() { # Adjust KOHA_HOME, PERL5LIB, KOHA_BINDIR for git installs diff --git a/debian/scripts/koha-indexer b/debian/scripts/koha-indexer index 554faf6bbf9..c0128c04bb3 100755 --- a/debian/scripts/koha-indexer +++ b/debian/scripts/koha-indexer @@ -195,7 +195,7 @@ while [ $# -gt 0 ]; do done # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 # Check if an alternate indexer has been set if [ ! -z "$ALTERNATE_INDEXER_DAEMON" ]; then diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack index eb3282c0f50..af34cefb697 100755 --- a/debian/scripts/koha-plack +++ b/debian/scripts/koha-plack @@ -367,7 +367,7 @@ _do_instance() { local KOHA_HOME=$KOHA_HOME local DEV_INSTALL=$DEV_INSTALL - adjust_paths_dev_install $name + adjust_paths_git_install $name PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer # If debug mode is enabled, add the debugger lib path # to PERL5LIB if appropriate diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra index 7dffdf38120..97195c2af2a 100755 --- a/debian/scripts/koha-rebuild-zebra +++ b/debian/scripts/koha-rebuild-zebra @@ -149,7 +149,7 @@ while [ -n "$*" ]; do done # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 # Parse command line. if [ $# -lt 1 ]; then diff --git a/debian/scripts/koha-reset-passwd b/debian/scripts/koha-reset-passwd index 14cfe33f037..f4408c0597f 100755 --- a/debian/scripts/koha-reset-passwd +++ b/debian/scripts/koha-reset-passwd @@ -46,7 +46,7 @@ set_password() local userid=$2 # Optionally use alternative paths for a dev install - adjust_paths_dev_install $1 + adjust_paths_git_install $1 if [ "$DEV_INSTALL" = "" ]; then KOHA_BINDIR=$KOHA_HOME/bin diff --git a/debian/scripts/koha-sip b/debian/scripts/koha-sip index 37b0125134f..80855f309b5 100755 --- a/debian/scripts/koha-sip +++ b/debian/scripts/koha-sip @@ -67,7 +67,7 @@ start_sip() if [ ! -f "/etc/koha/sites/${name}/SIPconfig.xml" ] || [ ! -f "/var/lib/koha/${name}/sip.enabled" ] ; then echo "SIP is disabled, or you do not have a SIPconfig.xml file." else - adjust_paths_dev_install $name + adjust_paths_git_install $name export KOHA_HOME PERL5LIB if [ "$DEV_INSTALL" = "" ]; then diff --git a/debian/scripts/koha-sitemap b/debian/scripts/koha-sitemap index 89b07e5e811..0bd737ceb5d 100755 --- a/debian/scripts/koha-sitemap +++ b/debian/scripts/koha-sitemap @@ -172,7 +172,7 @@ while [ $# -gt 0 ]; do done # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 if [ "$DEV_INSTALL" = "" ]; then KOHA_BINDIR=$KOHA_HOME/bin else diff --git a/debian/scripts/koha-translate b/debian/scripts/koha-translate index c06bffc8246..9182a4627b8 100755 --- a/debian/scripts/koha-translate +++ b/debian/scripts/koha-translate @@ -294,7 +294,7 @@ while [ $# -gt 0 ]; do done -if [ "$dev" != "" ]; then adjust_paths_dev_install $dev; fi +if [ "$dev" != "" ]; then adjust_paths_git_install $dev; fi check_koha_conf init_template_paths PERL_CMD=`which perl` diff --git a/debian/scripts/koha-upgrade-schema b/debian/scripts/koha-upgrade-schema index 01d9b696629..6ab80e34b7a 100755 --- a/debian/scripts/koha-upgrade-schema +++ b/debian/scripts/koha-upgrade-schema @@ -30,7 +30,7 @@ else fi # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 if [ "$DEV_INSTALL" = "" ]; then CGI_PATH=$KOHA_HOME/intranet/cgi-bin else diff --git a/debian/scripts/koha-worker b/debian/scripts/koha-worker index aa51c90c13f..76f470e6962 100755 --- a/debian/scripts/koha-worker +++ b/debian/scripts/koha-worker @@ -212,7 +212,7 @@ while [ $# -gt 0 ]; do done # Optionally use alternative paths for a dev install -adjust_paths_dev_install $1 +adjust_paths_git_install $1 if [ "$DEV_INSTALL" = "" ]; then worker_DAEMON="${KOHA_HOME}/bin/workers/background_jobs_worker.pl" diff --git a/debian/scripts/koha-z3950-responder b/debian/scripts/koha-z3950-responder index d8ac7e35265..6064a05dad2 100755 --- a/debian/scripts/koha-z3950-responder +++ b/debian/scripts/koha-z3950-responder @@ -302,7 +302,7 @@ if [ $# -gt 0 ]; then if is_instance $name; then - adjust_paths_dev_install $name + adjust_paths_git_install $name export DEV_INSTALL export KOHA_HOME PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer -- 2.50.1