From 37cf88efd2236acb03d75c8cd08a627095251dd5 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 12 Nov 2012 18:17:48 +0100 Subject: [PATCH] bug #1635: Fix grep for vmfs delete --- src/tm_mad/vmfs/delete | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tm_mad/vmfs/delete b/src/tm_mad/vmfs/delete index 4df1989480..084b12c911 100755 --- a/src/tm_mad/vmfs/delete +++ b/src/tm_mad/vmfs/delete @@ -22,7 +22,7 @@ function vifs_rmdir { DIR_TO_RM="$1" FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID/$DIR_TO_RM | \ -grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"` +grep -v "Content Listing"|grep -Fv -- "--------"|egrep -v "^[[:space:]]*$"` for file in $FILES_TO_ERASE; do exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$DIR_TO_RM/$file" \ @@ -90,7 +90,7 @@ else if [ `is_disk $DST_PATH` -eq 1 ]; then vifs_rmdir $(basename $DST_PATH) else - DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"` + DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -Fv -- "--------"|egrep -v "^[[:space:]]*$"` for dir in $DIRS_TO_ERASE; do vifs_rmdir $dir