Merge pull request #2112 from bmpotter/fix-minus-e

Issue 2067: fixed -e problem in agent-install.sh
open-horizon · Sep 25, 2020 · 3d756d7 · 3d756d7
2 parents 7f74527 + 3337954
commit 3d756d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/agent-install/agent-install.sh b/agent-install/agent-install.sh
@@ -860,7 +860,7 @@ function create_or_update_horizon_defaults() {
 
     if [[ ! -f /etc/default/horizon ]]; then
         log_info "Creating /etc/default/horizon ..."
-        sudo sh -c "echo -e 'HZN_EXCHANGE_URL=${HZN_EXCHANGE_URL}\nHZN_FSS_CSSURL=${HZN_FSS_CSSURL}\nHZN_DEVICE_ID=${NODE_ID}' > /etc/default/horizon"
+        sudo bash -c "echo -e 'HZN_EXCHANGE_URL=${HZN_EXCHANGE_URL}\nHZN_FSS_CSSURL=${HZN_FSS_CSSURL}\nHZN_DEVICE_ID=${NODE_ID}' > /etc/default/horizon"
         if [[ -n $abs_certificate ]]; then
             sudo sh -c "echo 'HZN_MGMT_HUB_CERT_PATH=$abs_certificate' >> /etc/default/horizon"
         fi

diff --git a/pkg/rpm/horizon-cli/.gitignore b/pkg/rpm/horizon-cli/.gitignore
@@ -4,5 +4,6 @@
 /fs/usr/horizon/bin/agent-install.sh
 /fs/usr/horizon/bin/agent-uninstall.sh
 /fs/usr/horizon/bin/edgeNodeFiles.sh
+/fs/usr/horizon/cluster
 /fs/etc/bash_completion.d/
 /fs/usr/share/man/