diff --git a/misc/rbkpkg.sh b/misc/rbkpkg.sh index 38e7d388..f8e38030 100644 --- a/misc/rbkpkg.sh +++ b/misc/rbkpkg.sh @@ -5,6 +5,7 @@ neType="$2" duration=180 expectBin=/usr/bin/expect omcBin=/usr/local/omc/bin +logFile=/tmp/actpkg`date +%Y%m%d`.log extension=$(basename "${1}" | awk -F . '{print $NF}') if [ ! -f ${expectBin} ]; then @@ -17,7 +18,7 @@ case "${extension}" in if [ ${neType} == "OMC" ]; then systemctl stop restagent.service fi - expect < ${logFile} spawn dpkg -i --force-all "$filename" set timeout ${duration} expect { @@ -25,22 +26,22 @@ case "${extension}" in } EOF if [ ${neType} == "OMC" ]; then - ${omcBin}/setomc.sh -m upgrade + ${omcBin}/setomc.sh -m upgrade >> ${logFile} fi ;; rpm) if [ ${neType} == "OMC" ]; then systemctl stop restagent.service fi - expect < ${logFile} + spawn rpm -Uvh "$filename" set timeout ${duration} expect { "y/n" { send "y\n"; exp_continue } } EOF if [ ${neType} == "OMC" ]; then - ${omcBin}/setomc.sh -m upgrade + ${omcBin}/setomc.sh -m upgrade >> ${logFile} fi ;; *)