From 2df72780e473709128a4f5d7f274a9063b288252 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Tue, 17 May 2016 11:06:07 -0400 Subject: scripts: bash-isms in scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I05f8718fb73c16dbb37c1f7460bb7b55cc0ffe97 BUG: 1336853 Reported-by: Patrick Matthäi Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/14401 NetBSD-regression: NetBSD Build System Reviewed-by: Niels de Vos Smoke: Gluster Build System Reviewed-by: Kotresh HR CentOS-regression: Gluster Build System --- tools/gfind_missing_files/gfid_to_path.sh | 5 +++-- tools/gfind_missing_files/gfind_missing_files.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'tools/gfind_missing_files') diff --git a/tools/gfind_missing_files/gfid_to_path.sh b/tools/gfind_missing_files/gfid_to_path.sh index 20ac6a94fd2..ebe817ac2f3 100644 --- a/tools/gfind_missing_files/gfid_to_path.sh +++ b/tools/gfind_missing_files/gfid_to_path.sh @@ -11,7 +11,7 @@ E_BADARGS=65 -function gfid_to_path() +gfid_to_path () { brick_dir=$1; gfid_file=$(readlink -e $2); @@ -29,7 +29,8 @@ function gfid_to_path() } -function main(){ +main () +{ if [ $# -ne 2 ] then echo "Usage: `basename $0` BRICK_DIR GFID_FILE"; diff --git a/tools/gfind_missing_files/gfind_missing_files.sh b/tools/gfind_missing_files/gfind_missing_files.sh index 07d6befc958..f42fe7b05af 100644 --- a/tools/gfind_missing_files/gfind_missing_files.sh +++ b/tools/gfind_missing_files/gfind_missing_files.sh @@ -14,18 +14,18 @@ SLAVEVOL= #Slave volume SLAVEMNT= #Slave gluster volume mount point WORKERS=4 #Default number of worker threads -function out() +out() { echo "$@"; } -function fatal() +fatal() { out FATAL "$@"; exit 1 } -function ping_host () +ping_host () { ### Use bash internal socket support { @@ -39,7 +39,7 @@ function ping_host () } 1>&2 2>/dev/null } -function mount_slave() +mount_slave() { local i; # inode number SSH_PORT=22 @@ -59,7 +59,7 @@ function mount_slave() [ "x$i" = "x1" ] || fatal "Could not mount volume $2 on $SLAVEMNT Please check host and volume exists"; } -function parse_cli() +parse_cli() { if [[ $# -ne 4 ]]; then echo "Usage: gfind_missing_files " @@ -76,7 +76,7 @@ function parse_cli() fi } -function main() +main() { parse_cli "$@"; -- cgit