shell script fixes

diff --git a/src/cclsinfo b/src/cclsinfo
index 8998247fa2bcdac33e19884322ba62f585945e91..5615af4852474a3a5cb5a7baf9a7f94273317d83 100755 (executable)
--- 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 48f692df9099f545152526a4a2be4009e3b530bd..6a3130d7e3baf16ccdbb4c6759870238040ae89e 100644 (file)
--- 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 59c5050e32a79621b4d5d54f58ebab071cd37903..6af3fc159fc0bc75753bdaa5efb20d3c0eea0c5e 100644 (file)
--- 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 f8a7b49711b4852aaefef7e15cb1a6b371a4ab8d..cbad73b7a16a9fabf4a5eb3b1628324b5d0a24fb 100755 (executable)
--- 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 3cad4cf06f62f473e38fcc9bd6ad99e35902804c..168205091d71d99f5981fe5bb1f5e34ca60dfdc2 100644 (file)
--- 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 6df108ca48aac48b4bf6d32d8bd11bee7ac4e4d9..c0bf8465cccb8f84a3c9d27a9a4b5b75bac24eaa 100755 (executable)
--- 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 7250f422378d96ba76de15d9a5b87510f3d8f4a8..a4bd60fca9e3a559e0ae065536afab724f0f5f4c 100755 (executable)
--- 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