From 6cca139f0a9f7b68a12f0384d48543e7c20528e6 Mon Sep 17 00:00:00 2001
From: Fred Ar <ar.fred@yahoo.com>
Date: Wed, 7 Jul 2010 07:47:57 -0700
Subject: [PATCH] shell script fixes

---
 src/cclsinfo       |  2 +-
 src/ceph_common.sh |  4 ++--
 src/init-ceph.in   |  2 +-
 src/loadclass.sh   |  8 ++++----
 src/mkcephfs.in    | 10 +++++-----
 src/stop.sh        |  2 +-
 src/vstart.sh      | 22 +++++++++++-----------
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/cclsinfo b/src/cclsinfo
index 8998247fa2bcd..5615af4852474 100755
--- a/src/cclsinfo
+++ b/src/cclsinfo
@@ -38,7 +38,7 @@ case $1 in
 	    show_default=0
 	    ;;
     * )
-	    [ "$fname" != "" ] && usage_exit
+	    [ -n "$fname" ] && usage_exit
 	    fname=$1
 	    ;;
 
diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 48f692df9099f..6a3130d7e3baf 100644
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -140,11 +140,11 @@ get_name_list() {
 
 
 get_val() {
-  [ "$2" != "" ] && export $1=$2 || export $1=`$CCONF -c $conf "$3" "$4" "$5"`
+  [ -n "$2" ] && export $1=$2 || export $1=`$CCONF -c $conf "$3" "$4" "$5"`
 }
 
 get_val_bool() {
-  if [ "$2" != "" ]; then
+  if [ -n "$2" ]; then
 	export $1=$2
   else
 	tmp=`$CCONF "$3" "$4" "$5"`
diff --git a/src/init-ceph.in b/src/init-ceph.in
index 59c5050e32a79..6af3fc159fc0b 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -150,7 +150,7 @@ case $1 in
 	    conf=$1
 	    ;;
     --hostname )
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    options="$options $1"
 	    shift
 	    hostname=$1
diff --git a/src/loadclass.sh b/src/loadclass.sh
index f8a7b49711b48..cbad73b7a16a9 100755
--- a/src/loadclass.sh
+++ b/src/loadclass.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 fname=$1
-[ "$fname" == "" ] && exit
+[ -z "$fname" ] && exit
 
 [ -e $fname ] || { echo "file no found: $fname"; exit; }
 
 name="`nm $fname | grep __cls_name__ | sed 's/.*__cls_name__//g' | head -1`"
-[ "$name" == "" ] && exit
+[ -z "$name" ] && exit
 
 ver="`nm $fname | grep __cls_ver__ | sed 's/.*__cls_ver__//g' | sed 's/_/\./g' | head -1`"
-[ "$ver" == "" ] && exit
+[ -z "$ver" ] && exit
 
 echo loading $name v$ver
 fl=`file $fname`
@@ -19,7 +19,7 @@ arch=""
 [ `echo "$fl" | grep -c i386` -gt 0 ] && arch="i386"
 [ `echo "$fl" | grep -c x86-64` -gt 0 ] && arch="x86-64"
 
-[ "$arch" == "" ] && { echo "lib architecture not identified"; exit; }
+[ -z "$arch" ] && { echo "lib architecture not identified"; exit; }
 
 `dirname $0`/ceph class add $name $ver $arch --in-data=$fname
 
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 3cad4cf06f62f..168205091d71d 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -51,27 +51,27 @@ case $1 in
 	    mkbtrfs=1
 	    ;;
     --conf | -c)
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    shift
 	    conf=$1
 	    ;;
     --numosd)
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    shift
 	    numosd=$1
 	    ;;
     --crushmapsrc)
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    shift
 	    usecrushmapsrc=$1
 	    ;;
     --crushmap)
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    shift
 	    usecrushmap=$1
 	    ;;
     -k)
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    shift
 	    adminkeyring=$1
 	    ;;
diff --git a/src/stop.sh b/src/stop.sh
index 6df108ca48aac..c0bf8465cccb8 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -4,7 +4,7 @@ test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
 
 do_killall() {
 	pg=`pgrep -f crun.*$1`
-	[ "$pg" != "" ] && kill $pg
+	[ -n "$pg" ] && kill $pg
 	$SUDO killall $1
 }
 
diff --git a/src/vstart.sh b/src/vstart.sh
index 7250f422378d9..a4bd60fca9e3a 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-[ "$CEPH_NUM_MON" = "" ] && CEPH_NUM_MON=3
-[ "$CEPH_NUM_OSD" = "" ] && CEPH_NUM_OSD=1
-[ "$CEPH_NUM_MDS" = "" ] && CEPH_NUM_MDS=3
+[ -z "$CEPH_NUM_MON" ] && CEPH_NUM_MON=3
+[ -z "$CEPH_NUM_OSD" ] && CEPH_NUM_OSD=1
+[ -z "$CEPH_NUM_MDS" ] && CEPH_NUM_MDS=3
 
 extra_conf=""
 new=0
@@ -53,22 +53,22 @@ case $1 in
 	    new=1
 	    ;;
     --valgrind )
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    valgrind=$2
 	    shift
 	    ;;
     --valgrind_mds )
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    valgrind_mds=$2
 	    shift
 	    ;;
     --valgrind_osd )
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    valgrind_osd=$2
 	    shift
 	    ;;
     --valgrind_mon )
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    valgrind_mon=$2
 	    shift
 	    ;;
@@ -91,7 +91,7 @@ case $1 in
 	    start_all=0
 	    ;;
     -m )
-	    [ "$2" = "" ] && usage_exit
+	    [ -z "$2" ] && usage_exit
 	    MON_ADDR=$2
 	    shift
 	    ;;
@@ -174,7 +174,7 @@ else
         mds log max segments = 2'
 fi
 
-if [ "$MON_ADDR" != "" ]; then
+if [ -n "$MON_ADDR" ]; then
 	CMON_ARGS=" -m "$MON_ADDR
 	COSD_ARGS=" -m "$MON_ADDR
 	CMDS_ARGS=" -m "$MON_ADDR
@@ -211,8 +211,8 @@ else
 fi
 echo "ip $IP"
 
-[ "$CEPH_BIN" = "" ] && CEPH_BIN=.
-[ "$CEPH_PORT" = "" ] && CEPH_PORT=6789
+[ -z "$CEPH_BIN" ] && CEPH_BIN=.
+[ -z "$CEPH_PORT" ] && CEPH_PORT=6789
 
 
 if [ "$cephx" -eq 1 ]; then
-- 
2.39.5