Skip to content

Commit ee3c643

Browse files
andrei-pavelandrei-pavel
committed
[#3025] use admin-utils.sh based on location in upgrade scripts
1 parent 29510c9 commit ee3c643

File tree

58 files changed

+406
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+406
-290
lines changed

‎src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

‎src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ set -eu
1414
# SC2034: ... appears unused. Verify use (or export if used externally).
1515
prefix="@prefix@"
1616

17-
# Include utilities. Use installed version if available and
18-
# use build version if it isn't.
19-
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
17+
# Include utilities based on location of this script. Check for sources first,
18+
# so that the unexpected situations with weird paths fall on the default
19+
# case of installed.
20+
script_path=$(cd "$(dirname "${0}")" && pwd)
21+
if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
2022
# shellcheck source=./src/bin/admin/admin-utils.sh.in
21-
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
23+
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
2224
else
2325
# shellcheck source=./src/bin/admin/admin-utils.sh.in
24-
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
26+
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
2527
fi
2628

2729
VERSION=$(mysql_version "$@")

0 commit comments

Comments
 (0)