mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[#2071] fixed paths for distcheck to work

Browse Source
This commit is contained in:
Razvan Becheriu
2022-06-02 17:19:57 +03:00
committed by Francis Dupont
parent d1d4aefec6
commit b6e2327527
44 changed files with 233 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/bin/admin/kea-admin.in
View File

@@ -58,7 +58,7 @@ fi
if test -d "@sbindir@"; then
kea_lfc="@sbindir@/kea-lfc"
else
kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc"
kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc"
fi
# Prints out usage version.
@@ -344,16 +344,31 @@ mysql_upgrade() {
checked_mysql_version
printf '\n'
upgrade_scripts_dir=${scripts_dir}/mysql
# Check if the scripts directory exists at all.
if [ ! -d ${scripts_dir}/mysql ]; then
log_error "Invalid scripts directory: ${scripts_dir}/mysql"
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find "${scripts_dir}/mysql" -name 'upgrade*.sh' -type f | wc -l)
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
if [ "$num_files" -eq 0 ]; then
log_error "No scripts in ${scripts_dir}/mysql or the directory is not readable or does not have any upgrade* scripts."
upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
fi
if [ "$num_files" -eq 0 ]; then
log_error "No scripts in ${upgrade_scripts_dir} or the directory is not readable or does not have any upgrade* scripts."
exit 1
fi
@@ -363,7 +378,7 @@ mysql_upgrade() {
printf "Verifying upgrade permissions for %s\n" "$db_user"
mysql_can_create
for script in "${scripts_dir}"/mysql/upgrade*.sh
for script in "${upgrade_scripts_dir}"/upgrade*.sh
do
echo "Processing $script file..."
"${script}" --host="${db_host}" --user="${db_user}" \
@@ -379,16 +394,31 @@ pgsql_upgrade() {
version=$(checked_pgsql_version)
printf "Database version reported before upgrade: %s\n" "$version"
upgrade_scripts_dir=${scripts_dir}/pgsql
# Check if the scripts directory exists at all.
if [ ! -d ${scripts_dir}/pgsql ]; then
log_error "Invalid scripts directory: ${scripts_dir}/pgsql"
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find "${scripts_dir}/pgsql" -name 'upgrade*.sh' -type f | wc -l)
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
if [ "$num_files" -eq 0 ]; then
log_error "No scripts in ${scripts_dir}/pgsql or the directory is not readable or does not have any upgrade* scripts."
upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
fi
if [ "$num_files" -eq 0 ]; then
log_error "No scripts in ${upgrade_scripts_dir} or the directory is not readable or does not have any upgrade* scripts."
exit 1
fi
@@ -396,7 +426,7 @@ pgsql_upgrade() {
# thru an env
export PGPASSWORD=$db_password
for script in "${scripts_dir}"/pgsql/upgrade*.sh
for script in "${upgrade_scripts_dir}"/upgrade*.sh
do
echo "Processing $script file..."
"${script}" -U "${db_user}" -h "${db_host}" \

74
src/bin/admin/tests/mysql_tests.sh.in
View File

@@ -64,7 +64,6 @@ run_statement() {
fi
}
# Wipe all tables from the DB:
mysql_wipe() {
printf "Wiping whole database %s...\n" "${db_name}"
@@ -158,7 +157,7 @@ INSERT INTO schema_version VALUES (1, 7);'
}
mysql_db_version_with_extra_test() {
test_start "mysql.db-version-with-extra"
test_start "mysql.db-version_with_extra"
# Let's wipe the whole database
mysql_wipe
@@ -189,13 +188,13 @@ INSERT INTO schema_version VALUES (1, 7);'
# Multiple -x.
run_command \
"${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" \
-x --protocol=TCP -x --hello 2> "@abs_top_srcdir@/src/bin/admin/test-data"
-x --protocol=TCP -x --hello 2> "@abs_top_builddir@/src/bin/admin/test-data"
assert_eq 2 "${EXIT_CODE}" "kea-admin -x -x succeeded. (expected %d, exit code %d)"
if ! grep -F "unknown option '--hello'" "@abs_top_srcdir@/src/bin/admin/test-data"; then
if ! grep -F "unknown option '--hello'" "@abs_top_builddir@/src/bin/admin/test-data"; then
printf 'second parameter --hello was not passed to mysql with -x\n'
test_finish 1
fi
rm -f "@abs_top_srcdir@/src/bin/admin/test-data"
rm -f "@abs_top_builddir@/src/bin/admin/test-data"
# Let's wipe the whole database
mysql_wipe
@@ -268,20 +267,35 @@ mysql_host_reservation_init_test() {
mysql_upgrade_schema_to_version() {
target_version=$1
upgrade_scripts_dir=${db_scripts_dir}/mysql
# Check if the scripts directory exists at all.
if [ ! -d ${db_scripts_dir}/mysql ]; then
log_error "Invalid scripts directory: ${db_scripts_dir}/mysql"
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find ${db_scripts_dir}/mysql/upgrade*.sh -type f | wc -l)
num_files=$(find ${upgrade_scripts_dir}/upgrade*.sh -type f | wc -l)
if [ "${num_files}" -eq 0 ]; then
log_error "No scripts in ${db_scripts_dir}/mysql?"
upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
fi
if [ "${num_files}" -eq 0 ]; then
log_error "No scripts in ${upgrade_scripts_dir}?"
exit 1
fi
for script in "${db_scripts_dir}"/mysql/upgrade*.sh
for script in "${upgrade_scripts_dir}"/upgrade*.sh
do
version=$(mysql_version)
if [ "${version}" = "${target_version}" ]
@@ -1381,8 +1395,9 @@ insert into lease4 values(12,22,NULL,40,(SELECT FROM_UNIXTIME(1643212345)),50,1,
cmp -s "${output_file}" "${ref_file}"
assert_eq 0 "${EXIT_CODE}" "dump file does not match reference file, expected exit code %d, actual %d, diff:\n$(diff ${ref_file} ${output_file})"
# Remove the output file.
# Remove the files.
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Let's wipe the whole database
mysql_wipe
@@ -1443,8 +1458,9 @@ insert into lease6 values('::12',22,30,(SELECT FROM_UNIXTIME(1643212345)),40,50,
cmp -s "${output_file}" "${ref_file}"
assert_eq 0 "${EXIT_CODE}" "dump file does not match reference file, expected exit code %d, actual %d, diff:\n$(diff ${ref_file} ${output_file})"
# Remove the output file.
# Remove the files.
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Let's wipe the whole database
mysql_wipe
@@ -1457,7 +1473,14 @@ mysql_lease4_upload_test() {
test_start "mysql.lease4_upload_test${1-}"
input_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease4_dump_test.reference.csv"
output_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease4_dump_test.output.csv"
input_file_cp="@abs_top_builddir@/src/bin/admin/tests/data/lease4_dump_test.reference.csv"
output_file="@abs_top_builddir@/src/bin/admin/tests/data/lease4_dump_test.output.csv"
if [ "${input_file}" != "${input_file_cp}" ]; then
cp -f ${input_file} ${input_file_cp}
input_file=${input_file_cp}
input_file_cp=""
fi
# Wipe the whole database.
mysql_wipe
@@ -1502,8 +1525,13 @@ mysql_lease4_upload_test() {
cmp -s "${input_file}" "${output_file}"
assert_eq 0 "${EXIT_CODE}" "file resulted from dump after upload does not match file used for upload, expected exit code %d, actual %d, diff:\n$(diff ${input_file} ${output_file})"
# Remove the output file.
# Remove the files.
if [ "${input_file}" != "${input_file_cp}" ]; then
rm -f "${input_file}"
fi
rm -f "${input_file}.tmp"
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Wipe the whole database.
mysql_wipe
@@ -1516,7 +1544,14 @@ mysql_lease6_upload_test() {
test_start "mysql.lease6_upload_test${1-}"
input_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease6_dump_test.reference.csv"
output_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease6_dump_test.output.csv"
input_file_cp="@abs_top_builddir@/src/bin/admin/tests/data/lease6_dump_test.reference.csv"
output_file="@abs_top_builddir@/src/bin/admin/tests/data/lease6_dump_test.output.csv"
if [ "${input_file}" != "${input_file_cp}" ]; then
cp -f ${input_file} ${input_file_cp}
input_file=${input_file_cp}
input_file_cp=""
fi
# Wipe the whole database.
mysql_wipe
@@ -1561,8 +1596,13 @@ mysql_lease6_upload_test() {
cmp -s "${input_file}" "${output_file}"
assert_eq 0 "${EXIT_CODE}" "file resulted from dump after upload does not match file used for upload, expected exit code %d, actual %d, diff:\n$(diff ${input_file} ${output_file})"
# Remove the output file.
# Remove the files.
if [ "${input_file}" != "${input_file_cp}" ]; then
rm -f "${input_file}"
fi
rm -f "${input_file}.tmp"
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Wipe the whole database.
mysql_wipe
@@ -2359,8 +2399,8 @@ mysql_lease4_upload_test
mysql_lease4_upload_test -y
mysql_lease6_upload_test
mysql_lease6_upload_test -y
mysql_lease6_stat_test
mysql_lease4_stat_test
mysql_lease6_stat_test
mysql_lease_stat_upgrade_test
mysql_lease_stat_recount_test
mysql_unused_subnet_id_test

65
src/bin/admin/tests/pgsql_tests.sh.in
View File

@@ -761,7 +761,7 @@ pgsql_upgrade_12_to_13_test() {
}
pgsql_upgrade_test() {
test_start "pgsql.upgrade-test"
test_start "pgsql.upgrade"
# Wipe the whole database
pgsql_wipe
@@ -883,8 +883,9 @@ insert into lease4 values(12,E'\\\\x3232','',40,TO_TIMESTAMP(1643212345),50,'t',
cmp -s "${output_file}" "${ref_file}"
assert_eq 0 "${EXIT_CODE}" "dump file does not match reference file, expected exit code %d, actual %d, diff:\n$(diff "${ref_file}" "${output_file}")"
# Remove the output file.
# Remove the files.
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Let's wipe the whole database
pgsql_wipe
@@ -956,8 +957,9 @@ insert into lease6 values('::12',E'\\\\x3232',30,TO_TIMESTAMP(1643212345),40,50,
cmp -s "${output_file}" "${ref_file}"
assert_eq 0 "${EXIT_CODE}" "dump file does not match reference file, expected exit code %d, actual %d, diff:\n$(diff "${ref_file}" "${output_file}")"
# Remove the output file.
# Remove the files.
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Let's wipe the whole database
pgsql_wipe
@@ -970,7 +972,14 @@ pgsql_lease4_upload_test() {
test_start "pgsql.lease4_upload_test"
input_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease4_dump_test.reference.csv"
output_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease4_dump_test.output.csv"
input_file_cp="@abs_top_builddir@/src/bin/admin/tests/data/lease4_dump_test.reference.csv"
output_file="@abs_top_builddir@/src/bin/admin/tests/data/lease4_dump_test.output.csv"
if [ "${input_file}" != "${input_file_cp}" ]; then
cp -f ${input_file} ${input_file_cp}
input_file=${input_file_cp}
input_file_cp=""
fi
# Wipe the whole database.
pgsql_wipe
@@ -1013,8 +1022,13 @@ pgsql_lease4_upload_test() {
cmp -s "${input_file}" "${output_file}"
assert_eq 0 "${EXIT_CODE}" "file resulted from dump after upload does not match file used for upload, expected exit code %d, actual %d, diff:\n$(diff "${input_file}" "${output_file}")"
# Remove the output file.
# Remove the files.
if [ "${input_file}" != "${input_file_cp}" ]; then
rm -f "${input_file}"
fi
rm -f "${input_file}.tmp"
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Wipe the whole database.
pgsql_wipe
@@ -1026,7 +1040,14 @@ pgsql_lease6_upload_test() {
test_start "pgsql.lease6_upload_test"
input_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease6_dump_test.reference.csv"
output_file="@abs_top_srcdir@/src/bin/admin/tests/data/lease6_dump_test.output.csv"
input_file_cp="@abs_top_builddir@/src/bin/admin/tests/data/lease6_dump_test.reference.csv"
output_file="@abs_top_builddir@/src/bin/admin/tests/data/lease6_dump_test.output.csv"
if [ "${input_file}" != "${input_file_cp}" ]; then
cp -f ${input_file} ${input_file_cp}
input_file=${input_file_cp}
input_file_cp=""
fi
# Wipe the whole database.
pgsql_wipe
@@ -1069,8 +1090,13 @@ pgsql_lease6_upload_test() {
cmp -s "${input_file}" "${output_file}"
assert_eq 0 "${EXIT_CODE}" "file resulted from dump after upload does not match file used for upload, expected exit code %d, actual %d, diff:\n$(diff "${input_file}" "${output_file}")"
# Remove the output file.
# Remove the files.
if [ "${input_file}" != "${input_file_cp}" ]; then
rm -f "${input_file}"
fi
rm -f "${input_file}.tmp"
rm -f "${output_file}"
rm -f "${output_file}.tmp"
# Wipe the whole database.
pgsql_wipe
@@ -1083,16 +1109,31 @@ pgsql_lease6_upload_test() {
pgsql_upgrade_schema_to_version() {
target_version=$1
upgrade_scripts_dir=${db_scripts_dir}/pgsql
# Check if the scripts directory exists at all.
if [ ! -d ${db_scripts_dir}/pgsql ]; then
log_error "Invalid scripts directory: ${db_scripts_dir}/pgsql"
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find ${db_scripts_dir}/pgsql/upgrade*.sh -type f | wc -l)
num_files=$(find ${upgrade_scripts_dir}/upgrade*.sh -type f | wc -l)
if [ "${num_files}" -eq 0 ]; then
log_error "No scripts in ${db_scripts_dir}/pgsql?"
upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
log_error "Invalid scripts directory: ${upgrade_scripts_dir}"
exit 1
fi
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
fi
if [ "${num_files}" -eq 0 ]; then
log_error "No scripts in ${upgrade_scripts_dir}?"
exit 1
fi
@@ -1100,7 +1141,7 @@ pgsql_upgrade_schema_to_version() {
# thru an env
export PGPASSWORD=$db_password
for script in "${db_scripts_dir}"/pgsql/upgrade*.sh
for script in "${upgrade_scripts_dir}"/upgrade*.sh
do
version=$(pgsql_version)
if [ "${version}" = "${target_version}" ]

4
src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
View File

@@ -22,8 +22,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

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

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

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

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/mysql/wipe_data.sh.in
View File

@@ -25,8 +25,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
View File

@@ -19,8 +19,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi

4
src/share/database/scripts/pgsql/wipe_data.sh.in
View File

@@ -25,8 +25,8 @@ prefix="@prefix@"
# Include utilities. Use installed version if available and
# use build version if it isn't.
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
else
. "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
fi