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 <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
parent
b627f950c7
commit
b020689bcc
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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`
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue