Bugzilla – Attachment 184799 Details for
Bug 39740
[Follow-up of 36932] Split dev_install into git_install and debug_mode
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39740: Rename function to adjust_paths_git_install
Bug-39740-Rename-function-to-adjustpathsgitinstall.patch (text/plain), 6.89 KB, created by
Marcel de Rooy
on 2025-07-29 12:56:34 UTC
(
hide
)
Description:
Bug 39740: Rename function to adjust_paths_git_install
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2025-07-29 12:56:34 UTC
Size:
6.89 KB
patch
obsolete
>From 99fda3d4816a8d04d5efd06c8188a96bae54f1ad Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 24 Jul 2025 13:37:48 +0200 >Subject: [PATCH] Bug 39740: Rename function to adjust_paths_git_install >Content-Type: text/plain; charset=utf-8 > >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 <m.de.rooy@rijksmuseum.nl> >--- > 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 f337b8fa71..bdd1d6f20e 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 29d78f9664..5c61aee63b 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 c120c2eb42..367260a429 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 554faf6bbf..c0128c04bb 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 eb3282c0f5..af34cefb69 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 7dffdf3812..97195c2af2 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 14cfe33f03..f4408c0597 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 37b0125134..80855f309b 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 89b07e5e81..0bd737ceb5 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 c06bffc824..9182a4627b 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 01d9b69662..6ab80e34b7 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 aa51c90c13..76f470e696 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 d8ac7e3526..6064a05dad 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.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39740
:
184187
|
184432
|
184798
|
184799
|
184800
|
184801
|
184802
|
184803
|
184804
|
184873
|
184874
|
184920
|
184989
|
184990
|
184991
|
184992
|
184993
|
184994
|
184995
|
184996
|
184997
|
184998