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

2025-08-31 22:15:23 +00:00 · 2022-08-19 18:02:00 +03:00
parent 2b4a49b662
commit c69f7b6bea
52 changed files with 95 additions and 93 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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