pass -noDigest parameter to auoms bundle installer

microsoft · Oct 7, 2022 · 0188559 · 0188559
1 parent a75b24b
commit 0188559
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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"