percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-12-18 02:06:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix arch check and find_mysql_base_dir().

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-29 16:12:33 -06:00
parent e560b7e3dc
commit 80308dcb5d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sandbox/jenkins-test
View File

@@ -22,7 +22,7 @@ util/check-dev-env
# Install barebones MySQL binaries. # # Install barebones MySQL binaries. #
##################################### #####################################
if [ $(uname -a | grep x86_64 >/dev/null 2>&1) ]; then if uname -a | grep x86_64 >/dev/null 2>&1; then
ARCH="64" ARCH="64"
else else
ARCH="32" ARCH="32"
@@ -32,10 +32,10 @@ MYSQL_BIN_DIR="$HOME/mysql-bin"
[ -d "$MYSQL_BIN_DIR" ] || mkdir "$MYSQL_BIN_DIR" [ -d "$MYSQL_BIN_DIR" ] || mkdir "$MYSQL_BIN_DIR"
find_mysql_base_dir() { find_mysql_base_dir() {
find "$MYSQL_BIN_DIR" -name "mysql-$1\*" -type d | tail -n 1 find "$MYSQL_BIN_DIR" -name "mysql-$1*" -type d | tail -n 1
} }
MYSQL_BASE_DIR=$(find_mysql_base_dir $MYSQL) MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
if [ -z "$MYSQL_BASE_DIR" ]; then if [ -z "$MYSQL_BASE_DIR" ]; then
( (
cd $MYSQL_BIN_DIR cd $MYSQL_BIN_DIR
@@ -43,7 +43,7 @@ if [ -z "$MYSQL_BASE_DIR" ]; then
tar xvfz mysql.tar.gz tar xvfz mysql.tar.gz
rm mysql.tar.gz rm mysql.tar.gz
) )
MYSQL_BASE_DIR=$(find_mysql_base_dir $MYSQL) MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
fi fi
if [ -z $("$MYSQL_BASE_DIR/bin/mysqld" -V) ]; then if [ -z $("$MYSQL_BASE_DIR/bin/mysqld" -V) ]; then