[Commits] f1fbe80: Yet another fix for .sh

Alexey Botchkov holyfoot at askmonty.org
Sun Sep 25 22:54:55 EEST 2016


revision-id: f1fbe80d09c59ad377fdc178900b83ae6cb2e7bb (mariadb-10.1.17-23-gf1fbe80)
parent(s): 0a80509b062dd8c9920a1a2d913fcc195bf66d9c
committer: Alexey Botchkov
timestamp: 2016-09-25 12:01:39 +0400
message:

Yet another fix for .sh

---
 scripts/mysql_install_db.sh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 4b79330..1daa1bf 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -270,8 +270,7 @@ then
   extra_bindir="$basedir/extra"
   mysqld="$basedir/sql/mysqld"
   langdir="$basedir/sql/share/english"
-  srcpkgdatadir="$srcdir/scripts"
-  buildpkgdatadir="$builddir/scripts"
+  pkgdatadir="$srcdir/scripts"
   scriptdir="$srcdir/scripts"
 elif test -n "$basedir"
 then
@@ -289,8 +288,7 @@ then
     cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
     exit 1
   fi
-  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
-  buildpkgdatadir=$srcpkgdatadir
+  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
   if test -z "$pkgdatadir"
   then
     cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
@@ -302,17 +300,16 @@ else
   bindir="@bindir@"
   extra_bindir="$bindir"
   mysqld="@libexecdir@/mysqld"
-  srcpkgdatadir="@pkgdatadir@"
-  buildpkgdatadir="@pkgdatadir@"
+  pkgdatadir="@pkgdatadir@"
   scriptdir="@scriptdir@"
 fi
 
 # Set up paths to SQL scripts required for bootstrap
-fill_help_tables="$srcpkgdatadir/fill_help_tables.sql"
-create_system_tables="$srcpkgdatadir/mysql_system_tables.sql"
-create_system_tables2="$srcpkgdatadir/mysql_performance_tables.sql"
-fill_system_tables="$srcpkgdatadir/mysql_system_tables_data.sql"
-maria_add_gis_sp="$srcpkgdatadir/maria_add_gis_sp_bootstrap.sql"
+fill_help_tables="$pkgdatadir/fill_help_tables.sql"
+create_system_tables="$pkgdatadir/mysql_system_tables.sql"
+create_system_tables2="$pkgdatadir/mysql_performance_tables.sql"
+fill_system_tables="$pkgdatadir/mysql_system_tables_data.sql"
+maria_add_gis_sp="$pkgdatadir/maria_add_gis_sp_bootstrap.sql"
 
 for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp"
 do


More information about the commits mailing list