From e6f6695034b5918f518c427a381fc04f8d9e7cca Mon Sep 17 00:00:00 2001 From: Narine Mossikyan Date: Fri, 7 Oct 2022 08:20:54 -0700 Subject: [PATCH] pass -noDigest parameter to auoms bundle installer --- build/Makefile | 2 +- installer/bundle/bundle_skel.sh | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/Makefile b/build/Makefile index a6d8927e0..55a2189de 100644 --- a/build/Makefile +++ b/build/Makefile @@ -23,7 +23,7 @@ $(error "ENABLE_DEBUG is not set. Please re-run configure") endif DSC_TARGET_DIR := $(DSC_DIR)/release -AUOMS_KITS_RELEASE_DIR := $(AUOMS_KITS_DIR)/release/2.5.2-52 +AUOMS_KITS_RELEASE_DIR := $(AUOMS_KITS_DIR)/release/2.5.2-52-ND AUOMS_KITS_RELEASE_1_3_DIR := $(AUOMS_KITS_DIR)/release/1.3.0-3 RUBY_DIR := $(BASE_DIR)/source/ext/ruby diff --git a/installer/bundle/bundle_skel.sh b/installer/bundle/bundle_skel.sh index 18a2abac6..7b7fe78c2 100644 --- a/installer/bundle/bundle_skel.sh +++ b/installer/bundle/bundle_skel.sh @@ -1481,7 +1481,11 @@ you should first purge the existing installation and then install using the --sk ./$i if [ $? -eq 0 ]; then - ./${BUNDLES_PATH}/${BUNDLE}-*universal.*.sh --install $FORCE $restartDependencies + if [ -n "${noDigest}" -a "${noDigest}" == "true" ]; then + ./${BUNDLES_PATH}/${BUNDLE}-*universal.*.sh --install --noDigest $FORCE $restartDependencies + else + ./${BUNDLES_PATH}/${BUNDLE}-*universal.*.sh --install $FORCE $restartDependencies + fi TEMP_STATUS=$? if [ $TEMP_STATUS -ne 0 ]; then echo "$BUNDLE package failed to install and exited with error code $TEMP_STATUS" @@ -1661,7 +1665,11 @@ you should first purge the existing installation and then install using the --sk ./$i if [ $? -eq 0 ]; then - ./${BUNDLES_PATH}/${BUNDLE}-*universal.*.sh --upgrade $FORCE $restartDependencies + if [ -n "${noDigest}" -a "${noDigest}" == "true" ]; then + ./${BUNDLES_PATH}/${BUNDLE}-*universal.*.sh --upgrade --noDigest $FORCE $restartDependencies + else + ./${BUNDLES_PATH}/${BUNDLE}-*universal.*.sh --upgrade $FORCE $restartDependencies + fi TEMP_STATUS=$? if [ $TEMP_STATUS -ne 0 ]; then echo "$BUNDLE package failed to upgrade and exited with error code $TEMP_STATUS"