Can't pass spaces through basename

I can't get the bash quoting right to pass spaces through the basename and heredoc. Instead, set a variable, and just use that.
kolide · Oct 29, 2019 · 8ff9cdc · 8ff9cdc
1 parent f730267
commit 8ff9cdc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/pkg/packaging/internal/assets.go b/pkg/packaging/internal/assets.go
diff --git a/pkg/packaging/internal/assets/postinstall-launchd.sh b/pkg/packaging/internal/assets/postinstall-launchd.sh
@@ -5,6 +5,7 @@
 /bin/launchctl stop com.{{.Identifier}}.launcher
 
 if [ ! -z "{{.InfoFilename}}" ]; then
+    PACKAGE_FILENAME=$(basename "$PACKAGE_PATH")
     cat <<EOF > "{{.InfoFilename}}"
 {{.InfoJson}}
 EOF

diff --git a/pkg/packaging/packaging.go b/pkg/packaging/packaging.go
@@ -535,7 +535,7 @@ func (p *PackageOptions) setupPostinst(ctx context.Context) error {
 		"identifier":    p.Identifier,
 		"installer_id":  "$INSTALL_PKG_SESSION_ID",
 		"download_path": "$PACKAGE_PATH",
-		"download_file": "$(basename \"$PACKAGE_PATH\")",
+		"download_file": "$PACKAGE_FILENAME",
 		"timestamp":     "$(date +%Y-%m-%dT%T%z)",
 		"version":       p.PackageVersion,
 		"user":          "$USER",