[#3025] use admin-utils.sh based on location in upgrade scripts

diff --git a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
index 35fede46d0ddb9943ce056028bdffdda9b7c7d0c..a34fbd10adce279058b1616561b30d9cac958432 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
index c51401be53bfff76a73eab6a9a8f37d5b62e585e..1524100c07ec30df63cb7c9bb1d0f4465bb826b8 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
index 786c77c1fa9de4ba3aa0d138bdbb1f49fdcc29ad..f2d9d87b0e00232c7c77562145fdecd7192623f5 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
index 8c2f84e01f9180f30ccd4f34f6a2cf9b50febf7b..4dfca82f178f4ed8e3e211e651c64fa84fc9b05a 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
index 58b5e080085b44f6ebf77767065c4922135c52f6..aa51b9798e613af99b84f7603dc5df338f67325c 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
index 1f1f2170040409b7661c872230038b86071a946a..be0d5205913c34a965282efc979b252dd9f29d7e 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
index c238ceb83eb78d740710881212bd075801489ff1..b9bcc4fb3ac1db75b30d982739befed04b5087d3 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
index c02cbc0d222309816cb2c806a3fa2503dac51d90..552091e0baa143941893b026334282a9cb15b189 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
index 9c7530be57e4dbe1715077acdedddb577935ae3e..d0ddbbfa14e574a06daa8330acf623de467054b2 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
index 5092837c6dc7508d72de41263d3c5f4b672ad67e..a640b7dd2b0414065f3234fe1f84298d3657af6a 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
index a885e22417b5b89c8a84e8f38395c4fc827c5e05..db7323cd49e50d3964cad67c10482e8351a5cd3a 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
index ceabf10b7536e3dd9a01f774791b6dd1beefa3a8..3aca6ad156534217af3939b60c8a9d76db56fb60 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
index 0439dab2cae19e8afc1aa8442ec9b2960e060a65..c0032f7a26e2dc42c40c615f15a1e8a0639e7f0f 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
index 0404d1c7549d6be1872bed3452f11844eecc3a7f..036a945a72ebb575915f21f3df11c8fae310a8a1 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
index a8e7ec81d1a4546a359dbfae08f1c872e81327b5..40247a1f996756c83b837abc73475217945e7daf 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
index e27a037291167a13596d6c99757b5d8c12aa1a99..7bdefe22d1787d930ee4860be103717f80dc12fd 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
index 1df9aac2ce45387953dc3ac090be56debcc0b377..bed6be0f29e9070792ea3dad77a02467f7d9d7f7 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
index 1621a5f9e58a2e14ecf9ca29f0f87e38e0114c7e..0521cfcedfbebfda21e8fcee926251235141d836 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(mysql_version "$@")

diff --git a/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
index 3179751c7716872116a7558e998f2f1a45c6c9f0..d0eff1a19f8017523a2f596f452ce10d8d1a3147 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
index c95cc8e278090ae589d437c0fdd13f1ba73af221..18a845819af00f46e6a43e3e77ac5706ed0e24f3 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
index 298822f98fb1839b1bc319dc778642f7d097da62..cfda986b3214e82e65a3f0193674d56dfe6df419 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
index e2efb1b4b7ab2ca7ed6cda73d3d1040276c1f00f..34e39e96544bff0abc38050055111e531d97f699 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
index 21b376bb02aa42be6500edb610fda1509918fb5c..8b714986b0073dbdaff0cc32a344a5917f355615 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index 01ed768a3e31e2e473bf2002fc28a95347086df7..6f89c0bb2fb7484d32411f84ab86b336bb8e99d0 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
index b667c818d9c49fa92c277728a3fc468dbef0f33d..627a2538c7d67033e487f13a567a1250042b7bf1 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
index aebd1759a172a03c386405ae7387a425f3f40c7f..2bcf15c6197b8affd48e897d442d4bf92b24d4de 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
index 0869c033251098f164bbf98c27d8ed6141943583..69c65737438eae0f0b9abf61d717863d9688a38c 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
index d971ff3d88ccd97526759c24260699e81223066d..721d35d570ecb0b8f4c0cb37a3974ccee38a09a9 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
index 21eb784afc51a8d7858a051e6691912ee06faa86..902cf9261a5d83d2721b3df3d1b22be7e20e3789 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
index 64bc6233e49f766aaeeece2707e02f4c13310632..5dd22477d277e0470ff460631dd38a2e5e8b636d 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in b/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
index ff948ba37e30217da45e4b39fc519c6f39777d4e..125a50ab1b2bbe90f8f2fb69adada14998646d4f 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # Check version.

diff --git a/src/share/database/scripts/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index ff726b7bdc172817825fbc428647486e7d8e25de..d46045296076da5232593aa4063e39eff7db6eb5 100644 (file)
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -20,14 +20,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # First argument must be the expected schema version <major>.<minor>

diff --git a/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in b/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
index a8f4c49d489a9ea9a123cc213df764cec457c962..62463077546a5f3c8f008c62ff3075cf4297307f 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
index 93f8ccb1c4a99e8485db1c17cd88498c49c9beb3..faafbf07b62b9bd2e303c487aabcfb808000e630 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
index b249b52bd24b1772fa1e17770c37aaa65f5f7307..d21c945b8a9512af6ac86b74691b6af9c24c5763 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
index bc2489f1783ba625475d8e4257968ca69908bcad..ee398afc897058329be76c6de92fd95bc0b159fa 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
index fe182767f2c27a913457d8fcea6ded4da599ef5c..d582df42c45c125d377d0552b2b8248fba3dc8f8 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
index d17dd0619a8b50d1654122a7b6baf5fa8912e78c..0e18498433934a92075d80c847a0d1b68365d018 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
index 78b9175a273830f6ea64df719f461b957589e27b..48ae9ec538e598931b5d7f6f73109f839429244c 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
index 2767f0eb2e9db84c745c36f7f4f72e21f3192db3..2721ae562b9b3f1326d1200dfafb72950eafa733 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
index d1b2faa01056eab5003eda63ba5086306d92a003..0382347ce63eefc5ff20db72a36b52db529799b8 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
index 7c1e1f69e1b53363d6d8983b3623b176fef75a0f..3a940ad3412613929de6cee1ae46c77038fceeee 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
index 0b36dadf900ff77f93cff9659ab1f1bb068281ca..c006dc3dfed6e88253c3592ba545d73301db8159 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
index 029fed8dcd1c76199d5c4d038659228a117c6c7f..f34ef709c4f9b5e643d03f58bbca1644a4c5c1e6 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in b/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
index 35d3ac8df5386d74b61c8445c103f92ab2697324..b2d8fbcea16f8562a997726989946700f824db6f 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in b/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
index c0894080ec553711b94a03041f37eca8ee854784..afb5b0a0204f1bce5f6a0bad511ce3e1efee9e1c 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in b/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
index 18fb4901def07e033f5bf8a2d8b9ba7c9cebbf20..c9194fc84c3eb33842631f70f53168e173e8571e 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in b/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
index 92af8a70449d4dca6864b3dd7449a66f0e98488f..8b83184c22ded3118dd8899f5f07fffc927e1b56 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
index b94d9e600b117d6fc9e7d4d1c9f6de15aac6de04..822192921da863a6cf8771c7c1bb119e8b3f3d7b 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in b/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
index f9ac5b1b242989ada43fe0f6298fc6bff8bbb196..4f48181cc1f72df04f36694d1ba03f0d5189e259 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in b/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in
index 6810ed0997819cf9f3cc541a3528fa0ebb97def6..72c13dc117cc17fcf267774ae8236b6d9e957b80 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
index eecf52f6fdc0d2a7b7c237111bdd9f96b9dc1614..95e9f28acbda00e81062dd251312c0754dfe412e 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in b/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in
index 7258b6f74eb85e52361897528d18a489cc6a7208..b72170074b222f02a4cf43a6423ea894a7d907e2 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in b/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in
index 7bcfc414c12561a01606f9626cbcf3f9bf192029..d62a42903c11bab006a78b461dc589b0f677cd05 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in b/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in
index 4af85f92d119840c5a5941380346ac1fb0aae0ca..2f1670bb3ed0b3f03877407897e922e52b474c5d 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
index f56cb1dc35c9e180fb6d93ee98cfcaeff5dbe3b5..a52961412fe2b1e4c1802b4b7900354de1ce4a6b 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in b/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in
index 2a80f5e278757aaea0fa29ed31f688250da2505d..41e3c97b41da3f7e37139c407ef3cd7150daf19f 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in
@@ -14,14 +14,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 VERSION=$(pgsql_version "$@")

diff --git a/src/share/database/scripts/pgsql/wipe_data.sh.in b/src/share/database/scripts/pgsql/wipe_data.sh.in
index 4cb4d3689c983bc32592d00059fb0460bdfd1cf0..cb40b793fc9720f56f0c679258e62cf18c378c17 100644 (file)
--- a/src/share/database/scripts/pgsql/wipe_data.sh.in
+++ b/src/share/database/scripts/pgsql/wipe_data.sh.in
@@ -20,14 +20,16 @@ set -eu
 # SC2034: ... appears unused. Verify use (or export if used externally).
 prefix="@prefix@"
 
-# Include utilities. Use installed version if available and
-# use build version if it isn't.
-if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 else
     # shellcheck source=./src/bin/admin/admin-utils.sh.in
-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
 # First argument must be the expected schema version <major>.<minor>