[#2541] reverted path in upgrade scripts and added admin-utils.sh.in

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccfbbd8ac4b5511f10aec00ded2832fba3daa2fd..4714f7ea7b68ba19b8df71a5a280b22a21f63b5a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ shellcheck:
   stage: test
   script:
     - SCRIPTS=
-    - SCRIPTS+="src/bin/admin/admin-utils.sh "
+    - SCRIPTS+="src/bin/admin/admin-utils.sh.in "
     - SCRIPTS+="src/bin/admin/kea-admin.in "
     - SCRIPTS+="src/bin/admin/tests/admin_tests.sh.in "
     - SCRIPTS+="src/bin/admin/tests/memfile_tests.sh.in "

diff --git a/configure.ac b/configure.ac
index d8605f6378e7243270f9e6c93e7393ffef23a20f..d653dd656470fff7f87f5f6c993ab45ec680afe0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1394,6 +1394,7 @@ AC_CONFIG_FILES([m4macros/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/bin/Makefile])
 AC_CONFIG_FILES([src/bin/admin/Makefile])
+AC_CONFIG_FILES([src/bin/admin/admin-utils.sh])
 AC_CONFIG_FILES([src/bin/admin/kea-admin],
                 [chmod +x src/bin/admin/kea-admin])
 AC_CONFIG_FILES([src/bin/admin/tests/Makefile])

diff --git a/src/bin/admin/.gitignore b/src/bin/admin/.gitignore
index 1f1c6f76312d430df7bdccaf9540d04cce622164..fba978c8e8cac3c9bc5aa93e4ff459dca7ff36a7 100644 (file)
--- a/src/bin/admin/.gitignore
+++ b/src/bin/admin/.gitignore
@@ -1 +1,2 @@
 /kea-admin
+/admin-utils.sh

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh.in
similarity index 100%
rename from src/bin/admin/admin-utils.sh
rename to src/bin/admin/admin-utils.sh.in

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index aae0e29ea02b593cb29727bc7bffd66fd997006b..e73cef199bde36198b5101467cb0d27ec0d9bb29 100644 (file)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -51,7 +51,7 @@ dump_qry=""
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
 # Find the installed kea-lfc if available. Fallback to sources otherwise.

diff --git a/src/bin/admin/tests/admin_tests.sh.in b/src/bin/admin/tests/admin_tests.sh.in
index 456019d38f1d3bfbc18e7421058bf29c330e1933..a987d20a8a92363ad13afb52d0324c016e3eab1d 100644 (file)
--- a/src/bin/admin/tests/admin_tests.sh.in
+++ b/src/bin/admin/tests/admin_tests.sh.in
@@ -17,7 +17,7 @@ set -eu
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Include admin utilities
-. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 
 # Set location of the kea-admin.
 kea_admin="@abs_top_builddir@/src/bin/admin/kea-admin"

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 9151fbe73a727d1752c93c6789914671a6166b1c..ceb541c5995845b2e0f2e0f010ff43dd9127528d 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -21,7 +21,7 @@ set -eu
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Include admin utilities
-. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 
 # Set path to the production schema scripts
 db_scripts_dir="@abs_top_srcdir@/src/share/database/scripts"

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 54d8d6c2850421d984b06deb82964f1f607588b5..a9704c394f83344a3724a8ff3685ffa9cfc07e8d 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -21,7 +21,7 @@ set -eu
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Include admin utilities
-. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 
 # Set path to the production schema scripts
 db_scripts_dir="@abs_top_srcdir@/src/share/database/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 1e1608966fbf83a25d58052587d42ad4d039c119..db141a48d0e1fb61a9df00a97f7230af3551ad67 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 a6c1f2e234f719d128787e8f0ea765fa99925a5f..48b78466a46cb6ee18c6afcb5011de1ab4194278 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 10cc7ff7d8448ba5eb23229fe1c8606a6bc574d0..644b042e6a25cc7cddf8f6acf00a2c80c0e0508b 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 34b81cbcdd8abc31fb9e53a14605947b6020f13e..226dae9d8c6a2d4b8a49779433baf0a815f7a292 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 607fc03f3e23962c5a149e6fff3e1f43606e2f99..e92769fabe6f6777ba90484db4049cbaf50d1b50 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 d129a72bb0da7e32717187a67fda128e9cbad3eb..3583b8e0b46ec225d162ec5c3d84e5939f869c8b 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 415995c56755e8632449bad9cd24c87324c9c0d0..038403dbb0dd46ca964ec2447b016d59925c8199 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 43a8e871a01302f824ec078bf8b1233e03591894..7d68043947d63cfabd5a7f062afe3119463fbd44 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 4d1a2f7d3751f4bd7d0db296b916f5aacab71a1a..3c1feac14fbe6c30d3b1cee1c98121fdcfe5f844 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 6d6c52a425790c87eb09e8fecc45e870752044cf..df1e70212774553fbc0e7556de06031a063a0fa7 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 e4e5fb3ae66948b3b071b3c3652e64860154ab23..16e38ed1ef5eae6bdbba726e2379c3142157dc22 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 d3243e31b822ce4886bab4d7d1e65d187d8d3944..2e1798e5379469fa00b5a2685f60ca59c0d9c753 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
@@ -22,8 +22,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 c0d6ebf22500f76dea77c52145a85b47fe15576d..8df938ff6ce43ad7793532bc8b5a908281cc06b4 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 86a220348341472fa83eab781bb5f9fe45aa8007..bfcf38f4351b10c2a2e67e5b87431fc37e206ef6 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 ef9d0c29d290b49797621056da3acf8cfc039c67..63f8a1239f295de54faed95b2df55c8220924c52 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 eb76089ce675e3a0305d43205d4d0b6f43530dea..203a6505a0a34d12a6eaf499a134a9da2b7ffbaa 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 bd05fbe3af18f5678575e397c6cacc0a705491d2..f6196dacd2d4c6e39ce929953cd26264f796d129 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 c02e10cf32e529d5ad3712108d57a236baeb5f76..92333741039c21df5cc8d59735d8faaf9afe6926 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 a99a46d61d837786c21766dca5cd2ca0bf6a7ac9..5c65209837dd52921ab7d57f9647db8fe3d23948 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 9e33e8b7f8c4c27613e13d0a4d327ca5882b35fe..12edfa79c40794c470a13a1a6ec13b3a83808417 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 3d3e599925360297ae77e34da9cf48d15f7a872e..32031ee0669b35b8b43abedc0b12f424f809dbc6 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 5b73e9a1c1b5156b2987e4dc57414fe04045d105..237ef5fc185a7d82ea450b53acf8274e1287db40 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 09e0cfc8f6d0cbaaea410fb2c68ec38cd1cc8eb1..30e8c87eab30eca594935470db580fb05c91026b 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 82c3ff51384830fef4855da1863393ef054cb049..d888961c63eda1eaa8756fb25e13b45b7004f6cc 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

diff --git a/src/share/database/scripts/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index a31ca37745f0cd37af8996cb1b7b6743114efef6..019300c95a1e6c3d67ec72dc2fe5e50831e44770 100644 (file)
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -25,8 +25,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 1a7378a51c08308e8048e2d2096d0f15aa7ff190..1e6d8066119bb968f2515e0eb0525461e9d8f999 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 6683c39095bb46fdf4064ca770c81ae706978ec8..599859bf59c54c05fe30a2d736c1e7152f47e475 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 48a8e1be512a707f6eaa824a5a4ce9f60834440d..1da6cb0b8cabca624fe3275c35693d8789fd2e2e 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 79ba6501e9d7429894c1e071bae185a683ebe6ca..d2dff8ca24509b2b89b18767141db740debd56ec 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 c39e59397351a367311008d7fa20a5b74babae3a..87b6b128d80283637e03e0b3a4c77adf4e929994 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 200e8937e67c3b620c6d58f7c69b31948a3c8d50..0a4c1f4c11bc37d5004d23c972ca132fdb2e6a09 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 be62005d8bcb2f47fd3b2a02e0c82b136321ca6d..994dd8fb26ed9e047f7e02819c8d34cae0de0732 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 c99a417864d17e10fb44592790c13984fedc1030..9db6f4b8efcd3de8f68b5c37d87c8811e3d3f8ba 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 f66520b3e7b0bf6b8555af37c9bbdb6b97162869..55a7827e6e4f9132e33fa54b85a33a753154dc11 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 260196d360d0ef32efd2de1b03ee9470bdfe0286..b1f651e7929142103672e46556fee64a00e22150 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 38149a30cd6486fc7d50792ec30a2da70b77e01a..730fe66f850fc6ef2277f306ad0fc6f9730ebd55 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 a2065b2739aa82b6860d670046116fc3bb452801..74cc95cc37a2dc8d3b74561868df2015127c95f6 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 f101dbdaa33e3cb8c67232a9c35ca0701ad9a60a..c03ae728be321b01f2d63a07382419d81fc52cb7 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 64df2c3b9917c7a670cfc3aebb845433e0140906..5c3632a15efc7cb3c680c1c811f361ac6e43db6f 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 cc8ff00f1683ed83fd79bc2058cd71e82182d35a..38ffa6b8cbe8a3616c76a32b45852cf48fac8333 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 7c35387a4d1f271b7fe7a8e762363858f0fe81ea..690f8d103b8d774b37160b0db1e26349747831de 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 e7ab2c316eca1f8672769570900917976a199e40..5805fce98c2a284e0121d6858d20ab76fe372b1b 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

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 8b6cb1d351d0c394bf2a3b623fe873190caa974e..776c6d194fc0f52c0975e64042b2da7dddc8198e 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
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

diff --git a/src/share/database/scripts/pgsql/wipe_data.sh.in b/src/share/database/scripts/pgsql/wipe_data.sh.in
index c19339cb0909ced8a68d95527a1ce199b1cfeb04..4996c91c7b4f77067096647196742cc789a0ecee 100644 (file)
--- a/src/share/database/scripts/pgsql/wipe_data.sh.in
+++ b/src/share/database/scripts/pgsql/wipe_data.sh.in
@@ -25,8 +25,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
-    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi