diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccfbbd8ac4..4714f7ea7b 100644 --- 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 d8605f6378..d653dd6564 100644 --- 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 1f1c6f7631..fba978c8e8 100644 --- 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 aae0e29ea0..e73cef199b 100644 --- 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 456019d38f..a987d20a8a 100644 --- 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 9151fbe73a..ceb541c599 100644 --- 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 54d8d6c285..a9704c394f 100644 --- 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 1e1608966f..db141a48d0 100644 --- 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 a6c1f2e234..48b78466a4 100644 --- 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 10cc7ff7d8..644b042e6a 100644 --- 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 34b81cbcdd..226dae9d8c 100644 --- 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 607fc03f3e..e92769fabe 100644 --- 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 d129a72bb0..3583b8e0b4 100644 --- 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 415995c567..038403dbb0 100644 --- 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 43a8e871a0..7d68043947 100644 --- 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 4d1a2f7d37..3c1feac14f 100644 --- 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 6d6c52a425..df1e702127 100644 --- 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 e4e5fb3ae6..16e38ed1ef 100644 --- 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 d3243e31b8..2e1798e537 100644 --- 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 c0d6ebf225..8df938ff6c 100644 --- 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 86a2203483..bfcf38f435 100644 --- 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 ef9d0c29d2..63f8a1239f 100644 --- 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 eb76089ce6..203a6505a0 100644 --- 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 bd05fbe3af..f6196dacd2 100644 --- 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 c02e10cf32..9233374103 100644 --- 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 a99a46d61d..5c65209837 100644 --- 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 9e33e8b7f8..12edfa79c4 100644 --- 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 3d3e599925..32031ee066 100644 --- 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 5b73e9a1c1..237ef5fc18 100644 --- 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 09e0cfc8f6..30e8c87eab 100644 --- 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 82c3ff5138..d888961c63 100644 --- 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 a31ca37745..019300c95a 100644 --- 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 1a7378a51c..1e6d806611 100644 --- 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 6683c39095..599859bf59 100644 --- 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 48a8e1be51..1da6cb0b8c 100644 --- 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 79ba6501e9..d2dff8ca24 100644 --- 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 c39e593973..87b6b128d8 100644 --- 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 200e8937e6..0a4c1f4c11 100644 --- 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 be62005d8b..994dd8fb26 100644 --- 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 c99a417864..9db6f4b8ef 100644 --- 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 f66520b3e7..55a7827e6e 100644 --- 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 260196d360..b1f651e792 100644 --- 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 38149a30cd..730fe66f85 100644 --- 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 a2065b2739..74cc95cc37 100644 --- 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 f101dbdaa3..c03ae728be 100644 --- 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 64df2c3b99..5c3632a15e 100644 --- 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 cc8ff00f16..38ffa6b8cb 100644 --- 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 7c35387a4d..690f8d103b 100644 --- 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 e7ab2c316e..5805fce98c 100644 --- 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 8b6cb1d351..776c6d194f 100644 --- 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 c19339cb09..4996c91c7b 100644 --- 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