Addressing copilot review comments

Signed-off-by: Abhijit Gadgil <agadgil@progress.com>

Author: agadgil-progress

.expeditor/scripts/shared.sh

@@ -27,7 +27,7 @@ curlbash_hab() {
                mv -f /usr/local/bin/hab /usr/local/bin/.hab-orig
             fi
 
-            sudo -E ./components/hab/install.sh -t "$pkg_target" -c "$_channel" -b "aarch64-darwin-opt" || \
+            sudo -E ./components/hab/install.sh -t "$pkg_target" -c "$_channel" || \
                 mv -f /usr/local/bin/.hab-orig /usr/local/bin/hab
 
             hab_binary="/usr/local/bin/hab"
@@ -565,7 +565,8 @@ macos_teardown_exit() {
 
 need_cmd() {
   if ! command -v "$1" >/dev/null 2>&1; then
-    exit_with "Required command '$1' not found on PATH" 127
+    echo "Required command '$1' not found on PATH" ;
+    exit 127
   fi
 }
 
@@ -582,7 +583,6 @@ install_acceptance_bootstrap_hab_binary() {
     need_cmd gtar
     need_cmd gtail
 
-    local hab_scratch_dir
     local hab_scratch_dir="hab_scratch"
     rm -Rf "${hab_scratch_dir}"
     mkdir "${hab_scratch_dir}"
@@ -592,8 +592,7 @@ install_acceptance_bootstrap_hab_binary() {
         --url https://bldr.acceptance.habitat.sh  \
         --download-directory="${hab_scratch_dir}"
 
-    local hab_artifact
-    hab_artifact=$(find "${hab_scratch_dir}"/artifacts -type f -name 'chef-hab-*-aarch64-darwin.hart')
+    local hab_artifact=$(find "${hab_scratch_dir}"/artifacts -type f -name 'chef-hab-*-aarch64-darwin.hart')
 
     # GNU tail, tar, from the mac-bootstrapper
     gtail --lines=+6 "${hab_artifact}" | \
@@ -603,7 +602,6 @@ install_acceptance_bootstrap_hab_binary() {
             --strip-components=8 \
             --wildcards "opt/hab/pkgs/chef/hab/*/*/bin"
 
-    local bootstrap_hab_binary
     local bootstrap_hab_binary="hab"
 
     install -v "${bootstrap_hab_binary}" /usr/local/bin/hab

.expeditor/verify.pipeline.yml

@@ -577,7 +577,6 @@ steps:
         limit: 2 # Addressing current Anka system timeouts due to oversubscription
 
   - label: "[unit] :darwin: common"
-    if: false
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
     agents:
@@ -597,7 +596,6 @@ steps:
         limit: 2 # Addressing current Anka system timeouts due to oversubscription
 
   - label: "[unit] :darwin: core"
-    if: false
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
     agents:
@@ -617,7 +615,6 @@ steps:
         limit: 2 # Addressing current Anka system timeouts due to oversubscription
 
   - label: "[unit] :darwin: hab"
-    if: false
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
     agents:
@@ -637,7 +634,6 @@ steps:
         limit: 2 # Addressing current Anka system timeouts due to oversubscription
 
   - label: "[unit] :darwin: http-client"
-    if: false
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
     agents:

components/core/src/fs.rs

@@ -223,7 +223,7 @@ lazy_static::lazy_static! {
             PathBuf::from(CACHE_ARTIFACT_PATH)
         } else {
             match dirs::home_dir() {
-                Some(home) => home.join(format!(".{}", CACHE_ARTIFACT_PATH)),
+                Some(home) => home.join(format!(".{}", CACHE_ARTIFACT_PATH.strip_prefix("opt/").unwrap_or(CACHE_ARTIFACT_PATH))),
                 None => PathBuf::from(CACHE_ARTIFACT_PATH),
             }
         }
@@ -234,7 +234,7 @@ lazy_static::lazy_static! {
             PathBuf::from(CACHE_BUILD_PATH)
         } else {
             match dirs::home_dir() {
-                Some(home) => home.join(format!(".{}", CACHE_BUILD_PATH)),
+                Some(home) => home.join(format!(".{}", CACHE_BUILD_PATH.strip_prefix("opt/").unwrap_or(CACHE_BUILD_PATH))),
                 None => PathBuf::from(CACHE_BUILD_PATH),
             }
         }
@@ -245,7 +245,7 @@ lazy_static::lazy_static! {
             PathBuf::from(CACHE_KEY_PATH_POSTFIX)
         } else {
             match dirs::home_dir() {
-                Some(home) => home.join(format!(".{}", CACHE_KEY_PATH_POSTFIX)),
+                Some(home) => home.join(format!(".{}", CACHE_KEY_PATH_POSTFIX.strip_prefix("opt/").unwrap_or(CACHE_KEY_PATH_POSTFIX))),
                 None => PathBuf::from(CACHE_KEY_PATH_POSTFIX),
             }
         }
@@ -259,7 +259,7 @@ lazy_static::lazy_static! {
             PathBuf::from(CACHE_SRC_PATH)
         } else {
             match dirs::home_dir() {
-                Some(home) => home.join(format!(".{}", CACHE_SRC_PATH)),
+                Some(home) => home.join(format!(".{}", CACHE_SRC_PATH.strip_prefix("opt/").unwrap_or(CACHE_SRC_PATH))),
                 None => PathBuf::from(CACHE_SRC_PATH),
             }
         }
@@ -270,7 +270,7 @@ lazy_static::lazy_static! {
             PathBuf::from(CACHE_SSL_PATH)
         } else {
             match dirs::home_dir() {
-                Some(home) => home.join(format!(".{}", CACHE_SSL_PATH)),
+                Some(home) => home.join(format!(".{}", CACHE_SSL_PATH.strip_prefix("opt/").unwrap_or(CACHE_SSL_PATH))),
                 None => PathBuf::from(CACHE_SSL_PATH),
             }
         }

components/hab/src/command/supportbundle.rs

@@ -3,7 +3,8 @@ use crate::{common::ui::{Status,
                          UIWriter},
             error::{Error,
                     Result},
-            hcore::{fs::FS_ROOT_PATH,
+            hcore::{fs::{FS_ROOT_PATH,
+                         ROOT_PATH},
                     os::net::hostname}};
 use chrono::Local;
 use flate2::{Compression,
@@ -39,7 +40,7 @@ pub fn start(ui: &mut UI) -> Result<()> {
                                &host,
                                dt.format("%Y%m%d%H%M%S"));
 
-    let sup_root = Path::new(&*FS_ROOT_PATH).join("hab").join("sup");
+    let sup_root = Path::new(&*FS_ROOT_PATH).join(ROOT_PATH).join("sup");
     let tar_gz = File::create(&tarball_name)?;
     let enc = GzEncoder::new(tar_gz, Compression::default());
     let mut tar = tar::Builder::new(enc);