build(snap): Revert interface check, error logging and xtrace

Signed-off-by: Mengyi Wang <[email protected]>
edgexfoundry · Apr 26, 2023 · 8449c7e · 8449c7e
1 parent 1643916
commit 8449c7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/snap/local/helper-go/install.go b/snap/local/helper-go/install.go
@@ -283,15 +283,8 @@ func install() {
 
 	var err error
 
-	// Install default config files only if no config provider is connected
-	isConnected, err := snapctl.IsConnected("edgex-config").Run()
-	if err != nil {
-		log.Fatalf("Error checking interface connection: %s", err)
-	}
-	if !isConnected {
-		if err = installConfFiles(); err != nil {
-			log.Fatalf("Error installing config files: %v", err)
-		}
+	if err = installConfFiles(); err != nil {
+		log.Fatalf("Error installing config files: %v", err)
 	}
 
 	if err = installSecretStore(); err != nil {

diff --git a/snap/local/runtime-helpers/bin/source-env-file.sh b/snap/local/runtime-helpers/bin/source-env-file.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 # convert cmdline to string array
 ARGV=($@)
@@ -16,6 +16,8 @@ if [ -f "$ENV_FILE" ]; then
     set -o allexport
     source "$ENV_FILE" set
     set +o allexport
+else
+    logger --tag=$TAG --stderr "sourcing $ENV_FILE: not found!"
 fi
 
 exec "$@"