From: Francis Dupont <fdupont@isc.org>
Date: Fri, 28 Jun 2019 10:31:19 +0000 (+0200)
Subject: [705-wipe_data-sh-and-other-upgrade_-scripts-do-not-set-prefix] Added prefix=@prefix... 
X-Git-Tag: Kea-1.6.0-beta2~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2187d7604177417a2a7a5b2665d3d33df8fcbce4;p=thirdparty%2Fkea.git

[705-wipe_data-sh-and-other-upgrade_-scripts-do-not-set-prefix] Added prefix=@prefix@ and put shell bang at the right place
---

diff --git a/src/share/database/scripts/cql/wipe_data.sh.in b/src/share/database/scripts/cql/wipe_data.sh.in
index 194300e381..03ec702ddb 100644
--- 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 6914f6de15..36b66aaf5a 100644
--- 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 0c28330ffd..6865a3ef4b 100644
--- 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 400bbaa079..84e3937808 100644
--- 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 88d2677f64..95a99f2079 100644
--- 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 f63179bb3b..172622e1d8 100644
--- 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 14d0ef0139..78dc4933eb 100644
--- 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 b692f69121..5e1e20a5b0 100644
--- 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 3bf129cce4..09a7f6e1a1 100644
--- 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 9c4c7c3477..47c29130ea 100644
--- 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 8f2a4ebec7..a7a331bc72 100644
--- 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 b46fed8881..78651e584f 100644
--- 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 b2ac8b9dd2..e334af0d00 100644
--- 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 22d6af4d82..f15ec6ae97 100644
--- 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 ac283c3c04..5f62a132b0 100644
--- 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 531f250b85..b05d670eae 100644
--- 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 3581ead644..66c9bc75bd 100644
--- 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 76f4683ea8..069133c1d4 100644
--- 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 b9513629c0..c2b12ee639 100644
--- 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 243b94692a..733d7c7c6e 100644
--- 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 4df8de6b05..93fb9450d5 100644
--- 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