Skip to content

Commit 4e44ae5

Browse files
authored
Fix config format outputted by preinstall script (#1149)
1 parent d4138d4 commit 4e44ae5

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ require (
6666
go.opentelemetry.io/collector/processor v1.30.0
6767
go.opentelemetry.io/collector/processor/batchprocessor v0.124.0
6868
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0
69+
go.opentelemetry.io/collector/processor/processortest v0.124.0
6970
go.opentelemetry.io/collector/receiver v1.30.0
7071
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0
7172
go.opentelemetry.io/collector/receiver/receivertest v0.124.0
@@ -74,6 +75,7 @@ require (
7475
go.opentelemetry.io/collector/scraper/scrapertest v0.124.0
7576
go.opentelemetry.io/otel v1.35.0
7677
go.uber.org/goleak v1.3.0
78+
go.uber.org/multierr v1.11.0
7779
go.uber.org/zap v1.27.0
7880
golang.org/x/mod v0.23.0
7981
golang.org/x/sync v0.13.0
@@ -260,7 +262,6 @@ require (
260262
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.0 // indirect
261263
go.opentelemetry.io/collector/processor/processorhelper v0.124.0 // indirect
262264
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.0 // indirect
263-
go.opentelemetry.io/collector/processor/processortest v0.124.0 // indirect
264265
go.opentelemetry.io/collector/processor/xprocessor v0.124.0 // indirect
265266
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.0 // indirect
266267
go.opentelemetry.io/collector/receiver/xreceiver v0.124.0 // indirect
@@ -289,7 +290,6 @@ require (
289290
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
290291
go.opentelemetry.io/otel/trace v1.35.0 // indirect
291292
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
292-
go.uber.org/multierr v1.11.0 // indirect
293293
golang.org/x/arch v0.12.0 // indirect
294294
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
295295
golang.org/x/tools v0.30.0 // indirect

scripts/packages/preinstall.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,13 @@ command:
130130
skip_verify: false
131131
"
132132

133-
echo "$v3_config_contents" > "$v3_config_file" \
134-
|| err_exit "Failed to write v3 config"
133+
if [ -n "$( echo -e )" ]; then
134+
echo "$v3_config_contents" > "$v3_config_file" \
135+
|| err_exit "Failed to write v3 config"
136+
else
137+
echo -e "$v3_config_contents" > "$v3_config_file" \
138+
|| err_exit "Failed to write v3 config"
139+
fi
135140
else
136141
echo "Existing NGINX Agent version is not v2, skipping config migration"
137142
fi

0 commit comments

Comments
 (0)