Skip to content

fix: remove breaking spaces exported desktop files #2051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dottorblaster merged 1 commit into from
Apr 6, 2026
+10 −8
Merged

fix: remove breaking spaces exported desktop files #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/inside-distrobox/assets/distrobox-export
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ if [ "${is_sudo}" -ne 0 ]; then
fi

# Prefix to add to an existing command to work through the container
container_command_prefix="${DISTROBOX_PATH:-"distrobox"} enter ${rootful} -n ${container_name} ${enter_flags} -- ${sudo_prefix} "
container_command_prefix="${DISTROBOX_PATH:-"distrobox"} enter${rootful:+ ${rootful}} -n ${container_name}${enter_flags:+ ${enter_flags}} --${sudo_prefix:+ ${sudo_prefix}} "

if [ -n "${rootful}" ]; then
container_command_prefix="env SUDO_ASKPASS=\"${sudo_askpass_path}\" DBX_SUDO_PROGRAM=\"sudo --askpass\" ${container_command_prefix}"
Expand Down Expand Up @@ -564,8 +564,8 @@ export_application()
# Add closing quote
# If a TryExec is present, we have to fake it as it will not work
# through the container separation
sed "s|^Exec=\(.*\)|Exec=${container_command_prefix} \1 |g" "${desktop_file}" |
sed "s|\(%.*\)|${extra_flags} \1|g" |
sed "s|^Exec=\(.*\)|Exec=${container_command_prefix}\1|g" "${desktop_file}" |
sed "s|\(%.*\)|${extra_flags:+${extra_flags} }\1|g" |
sed "/^TryExec=.*/d" |
sed "/^DBusActivatable=true/d" |
sed "s|Name.*|&${exported_app_label}|g" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/assets/desktop_entry.toml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name={{.entry_name}}
GenericName=Terminal entering {{.entry_name}}
Comment=Terminal entering {{.entry_name}}
Categories=Distrobox;System;Utility
Exec={{.distrobox_path}} enter {{.extra_flags}} {{.container_name}}
Exec={{.distrobox_path}} enter{{if .extra_flags}} {{.extra_flags}}{{end}} {{.container_name}}
Icon={{.icon}}
Keywords=distrobox;
NoDisplay=false
Expand All @@ -14,4 +14,4 @@ Actions=Remove;

[Desktop Action Remove]
Name=Remove {{.entry_name}} from system
Exec={{.distrobox_path}} rm {{.extra_flags}} {{.container_name}}
Exec={{.distrobox_path}} rm{{if .extra_flags}} {{.extra_flags}}{{end}} {{.container_name}}
8 changes: 5 additions & 3 deletions pkg/commands/generate_entry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Name=Test-container
GenericName=Terminal entering Test-container
Comment=Terminal entering Test-container
Categories=Distrobox;System;Utility
Exec=/usr/bin/distrobox enter test-container
Exec=/usr/bin/distrobox enter test-container
Icon=https://raw.githubusercontent.com/89luca89/distrobox/main/icons/terminal-distrobox-icon.svg
Keywords=distrobox;
NoDisplay=false
Expand All @@ -63,7 +63,8 @@ Actions=Remove;

[Desktop Action Remove]
Name=Remove Test-container from system
Exec=/usr/bin/distrobox rm test-container`
Exec=/usr/bin/distrobox rm test-container
`

content, err := os.ReadFile(expectedEntryPath)
if err != nil {
Expand Down Expand Up @@ -143,7 +144,8 @@ Actions=Remove;

[Desktop Action Remove]
Name=Remove Test-container from system
Exec=/usr/bin/distrobox rm --root test-container`
Exec=/usr/bin/distrobox rm --root test-container
`

content, err := os.ReadFile(expectedEntryPath)
if err != nil {
Expand Down