From aca8acc0387bad2479d239d10599aa296d6fa349 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 21 Sep 2012 17:47:20 +0200 Subject: [PATCH] bug #1360: Empty pass in shell script as well --- install.sh | 4 +++- src/datastore_mad/remotes/vmfs/clone | 6 +++++- src/datastore_mad/remotes/vmfs/cp | 6 +++++- src/datastore_mad/remotes/vmfs/mkfs | 6 +++++- src/datastore_mad/remotes/vmfs/rm | 6 +++++- src/tm_mad/vmfs/clone | 6 +++++- src/tm_mad/vmfs/context | 6 +++++- src/tm_mad/vmfs/delete | 6 +++++- src/tm_mad/vmfs/mkimage | 6 +++++- src/tm_mad/vmfs/mvds | 6 +++++- src/tm_mad/{vmware => vmfs}/postmigrate | 0 src/tm_mad/{vmware => vmfs}/premigrate | 0 12 files changed, 48 insertions(+), 10 deletions(-) rename src/tm_mad/{vmware => vmfs}/postmigrate (100%) rename src/tm_mad/{vmware => vmfs}/premigrate (100%) diff --git a/install.sh b/install.sh index 2501768021..000abf0db2 100755 --- a/install.sh +++ b/install.sh @@ -887,7 +887,9 @@ TM_VMFS_FILES="src/tm_mad/vmfs/clone \ src/tm_mad/vmfs/mv \ src/tm_mad/vmfs/context \ src/tm_mad/vmfs/mvds \ - src/tm_mad/vmfs/tm_vmfsrc" + src/tm_mad/vmfs/tm_vmfsrc + src/tm_mad/vmfs/postmigrate \ + src/tm_mad/vmfs/premigrate" TM_ISCSI_FILES="src/tm_mad/iscsi/clone \ src/tm_mad/iscsi/ln \ diff --git a/src/datastore_mad/remotes/vmfs/clone b/src/datastore_mad/remotes/vmfs/clone index 686441dd2c..fffdd6e157 100755 --- a/src/datastore_mad/remotes/vmfs/clone +++ b/src/datastore_mad/remotes/vmfs/clone @@ -68,7 +68,11 @@ DST_HOST=`get_destination_host $(dirname $0)` if [ "$USE_SSH" != "yes" ]; then USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi # ------------ Copy the image to the repository ------------- diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp index 29400e304f..2e5ec32b3f 100755 --- a/src/datastore_mad/remotes/vmfs/cp +++ b/src/datastore_mad/remotes/vmfs/cp @@ -79,7 +79,11 @@ DST_HOST=`get_destination_host $(dirname $0)` if [ "$USE_SSH" != "yes" ]; then USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi # Create DST in DST_HOST diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs index d9fd4887da..86890a2f5b 100755 --- a/src/datastore_mad/remotes/vmfs/mkfs +++ b/src/datastore_mad/remotes/vmfs/mkfs @@ -74,7 +74,11 @@ DST_HOST=`get_destination_host $(dirname $0)` if [ "$USE_SSH" != "yes" ]; then USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi # ------------ Image to save_as disk, no need to create a FS ------------ diff --git a/src/datastore_mad/remotes/vmfs/rm b/src/datastore_mad/remotes/vmfs/rm index 54a0ced192..dbaa8827b4 100755 --- a/src/datastore_mad/remotes/vmfs/rm +++ b/src/datastore_mad/remotes/vmfs/rm @@ -60,7 +60,11 @@ DST_FOLDER=`basename $SRC` if [ "$USE_SSH" != "yes" ]; then USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi # ------------ Remove the image from the repository ------------ diff --git a/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone index 624af00eeb..87afa2ff21 100755 --- a/src/tm_mad/vmfs/clone +++ b/src/tm_mad/vmfs/clone @@ -59,7 +59,11 @@ if [ "$USE_SSH" != "yes" ]; then IMAGE_DS_NAME=`basename $(dirname $SRC_PATH)` SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))` DST_DIR_WITHOUT_DS_PATH="[$SYSTEM_DS_NAME]${DST_PATH##"$DS_DIR/$SYSTEM_DS_NAME/"}" - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi if [ "$USE_SSH" == "yes" ]; then diff --git a/src/tm_mad/vmfs/context b/src/tm_mad/vmfs/context index 8d6f720816..008fe51b7c 100755 --- a/src/tm_mad/vmfs/context +++ b/src/tm_mad/vmfs/context @@ -53,7 +53,11 @@ DST_FOLDER=`basename $DST_PATH` if [ "$USE_SSH" != "yes" ]; then USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi if [ "$USE_SSH" == "yes" ]; then diff --git a/src/tm_mad/vmfs/delete b/src/tm_mad/vmfs/delete index 8436adc417..2558378347 100755 --- a/src/tm_mad/vmfs/delete +++ b/src/tm_mad/vmfs/delete @@ -60,7 +60,11 @@ if [ "$USE_SSH" == "yes" ]; then else USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"` for dir in $DIRS_TO_ERASE; do diff --git a/src/tm_mad/vmfs/mkimage b/src/tm_mad/vmfs/mkimage index 281dd6148f..f7bb5b9c3f 100755 --- a/src/tm_mad/vmfs/mkimage +++ b/src/tm_mad/vmfs/mkimage @@ -55,7 +55,11 @@ if [ "$USE_SSH" != "yes" ]; then SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))` USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi #------------------------------------------------------------------------------- diff --git a/src/tm_mad/vmfs/mvds b/src/tm_mad/vmfs/mvds index 2c47e9e9ba..0bd7e52a13 100755 --- a/src/tm_mad/vmfs/mvds +++ b/src/tm_mad/vmfs/mvds @@ -61,7 +61,11 @@ if [ "$USE_SSH" != "yes" ]; then SYSTEM_DS_NAME=`basename $(dirname $(dirname $SRC_PATH))` USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')` PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')` - VI_PARAMS="--server $SRC_HOST --username $USERNAME --password \"$PASSWORD\"" + if [ -z $PASSWORD ]; then + VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"\"" + else + VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD" + fi fi #------------------------------------------------------------------------------- diff --git a/src/tm_mad/vmware/postmigrate b/src/tm_mad/vmfs/postmigrate similarity index 100% rename from src/tm_mad/vmware/postmigrate rename to src/tm_mad/vmfs/postmigrate diff --git a/src/tm_mad/vmware/premigrate b/src/tm_mad/vmfs/premigrate similarity index 100% rename from src/tm_mad/vmware/premigrate rename to src/tm_mad/vmfs/premigrate