[705-wipe_data-sh-and-other-upgrade_-scripts-do-not-set-prefix] Added prefix=@prefix...

diff --git a/src/share/database/scripts/cql/wipe_data.sh.in b/src/share/database/scripts/cql/wipe_data.sh.in
index 194300e381542dbe1207459aa3fbe41317bf6aae..03ec702ddbdec716f1cb667627f8761e74e6ef52 100644 (file)
--- a/src/share/database/scripts/cql/wipe_data.sh.in
+++ b/src/share/database/scripts/cql/wipe_data.sh.in
@@ -1,17 +1,18 @@
+#!/bin/sh
+
 # Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#!/bin/sh
-
 # This script is primarily used for CQL unit tests, which need to
 # ensure an empty, but schema correct database for each test.  It
 # deletes ALL transient data from an existing Kea CQL schema,
 # including leases, reservations, etc... Use at your own peril.
 # Reference tables will be left in-tact.
 
+prefix=@prefix@a
 # 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

diff --git a/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in b/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
index 6914f6de15b356477c67a82084d7210953ef2bea..36b66aaf5a3a8f835cfbba5cd9a1a4e86ae6cec0 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in b/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
index 0c28330ffdaf6cfdaa2af441a53b61739e48aa16..6865a3ef4b6efd22818bba63d8ee789b7125c5a8 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in b/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
index 400bbaa079d88d188afe8f1a403d17b9f6368cb5..84e39378086eed3a61ebe66b6a6d9dc5ef67576c 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in b/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
index 88d2677f64d4049791e0efbae0b26583f731d64b..95a99f20793e7c172a0f96c4f2b38f67d8ed3769 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in b/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
index f63179bb3be772eac37068af7fc59467fcdfebb4..172622e1d8ef510c50ad2bdb3be6050d76fd6ada 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
index 14d0ef013910731994cb03cd477c089841e09566..78dc4933ebc87ae70a167ca586a0d503d4857786 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in b/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
index b692f6912106b5ed4e007428cf62d4bcaf8dbce3..5e1e20a5b0e5ab88d2b5cd0db609bd4382d67b04 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in b/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
index 3bf129cce432a58813604a254687713ca553a055..09a7f6e1a1d15b9b5542a3d32cb6ccd767b32139 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
index 9c4c7c3477e39d8a43f902735b9ed7a9d023039a..47c29130ea0f35ab3adbfb4c0c8eed8820fbd7be 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
index 8f2a4ebec73be2e76a47cd67380b4696ebe7b986..a7a331bc72d27090367038bc3e9d1ba535a5766e 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in b/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
index b46fed88817fe4b3765b8b78fc1a421392ebec94..78651e584f930e10bb1e1330982b9fb6fa125c55 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index b2ac8b9dd2190c7c8cb68d0033d32f4458090160..e334af0d007e1a9bd6144f4506c78bff393b232d 100644 (file)
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -1,17 +1,18 @@
+#!/bin/sh
+
 # Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#!/bin/sh
-
 # This script is primarily used for MySQL unit tests, which need to
 # ensure an empty, but schema correct database for each test.  It
 # deletes ALL transient data from an existing Kea MySQL schema,
 # including leases, reservations, etc... Use at your own peril.
 # Reference tables will be left in-tact.
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in b/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
index 22d6af4d8259fcc1ff25c33b4eeaf49b880e1607..f15ec6ae9734d4ed616868a7b799547d3f5bee53 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in b/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
index ac283c3c044bd3b89f4e3c240e0332cccadff0a1..5f62a132b0e090ed20029a30c7b6809ba6f50608 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in b/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
index 531f250b8541d7fdd6e667e3531b4f13151e591c..b05d670eae304b92678ebffdb3ddbcac4bb9cf60 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in b/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
index 3581ead6446b2d1efefd0beab2966a5c097c27d3..66c9bc75bdb5913764771199a4a046ff0d36a5b0 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in b/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
index 76f4683ea86ff98eb52d5bdc708a5d5af34a28d1..069133c1d433d055c64a59e6d45da7d58610efbf 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in b/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
index b9513629c0fc81d840c367967aefdda45b329646..c2b12ee639f1871a5e12a54f501e0f364d5bd32e 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in b/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
index 243b94692a9acee6750016805d7179f67094a6e3..733d7c7c6ecc2be3ed2ba5eec3034635474ef325 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+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

diff --git a/src/share/database/scripts/pgsql/wipe_data.sh.in b/src/share/database/scripts/pgsql/wipe_data.sh.in
index 4df8de6b05704c93c9d8991c71b4be0639e5309a..93fb9450d557b9db464b0ff787406ee8c181d8fc 100644 (file)
--- a/src/share/database/scripts/pgsql/wipe_data.sh.in
+++ b/src/share/database/scripts/pgsql/wipe_data.sh.in
@@ -1,17 +1,18 @@
+#!/bin/sh
+
 # Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#!/bin/sh
-
 # This script is primarily used for MySQL unit tests, which need to
 # ensure an empty, but schema correct database for each test.  It
 # deletes ALL transient data from an existing Kea MySQL schema,
 # including leases, reservations, etc... Use at your own peril.
 # Reference tables will be left in-tact.
 
+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