diff --git a/_eval_deploy_upgrade.sh b/_eval_deploy_upgrade.sh index 2b94a1c..be965e0 100755 --- a/_eval_deploy_upgrade.sh +++ b/_eval_deploy_upgrade.sh @@ -5,7 +5,12 @@ ip=$3 routerName=$4 mapPort=$5 index=$6 -sshArgs=$7 +force=$7 +sshArgs=$8 + +if [[ ! -n "${force}" ]]; then + force=0 +fi PROJ_DIR=/home/${username}/Documents/NDNDeployment DEPLOY_DIR=${PROJ_DIR}/deployment @@ -16,7 +21,7 @@ DEPLOY_DIR=${PROJ_DIR}/deployment set timeout -1 spawn ssh root@${ip} -p${mapPort} ${sshArgs} " cd ${PROJ_DIR} -sudo ./deploy-nfd.sh 1 +sudo ./deploy-nfd.sh ${force} " expect { "(yes/no)?" { diff --git a/eval_deploy.sh b/eval_deploy.sh index f573a8f..f099c49 100755 --- a/eval_deploy.sh +++ b/eval_deploy.sh @@ -107,9 +107,9 @@ function deal(){ ;; "upgrade") if [[ ${ASYNC} -eq 1 ]]; then - ./_eval_deploy_upgrade.sh ${username} ${password} ${ip} ${routerName} ${mapPort} ${index} "${sshArgs}" & + ./_eval_deploy_upgrade.sh ${username} ${password} ${ip} ${routerName} ${mapPort} ${index} ${args} "${sshArgs}" & else - ./_eval_deploy_upgrade.sh ${username} ${password} ${ip} ${routerName} ${mapPort} ${index} "${sshArgs}" + ./_eval_deploy_upgrade.sh ${username} ${password} ${ip} ${routerName} ${mapPort} ${index} ${args} "${sshArgs}" fi ;; "clone")