Add export and unexport commands for desktop and CLI integration #1682

silverhadch · 2025-07-12T16:19:33Z

This PR introduces two new subcommands: export and unexport.

toolbox export allows exporting GUI apps (.desktop files via --app) or CLI binaries (--bin) from a container to the host.
toolbox unexport allows removing those exported apps/binaries. It also supports --all to remove all exports for a container.

Also adds an additional runCommand Function that captures stdout of the run Command needed by the export.go.
Additionally some small refactor.

Examples:
toolbox export --app gimp --container Arch
→ Exports gimp to ~/.local/share/applications/gimp-Arch.desktop

toolbox export --bin nvim --container Arch
→ Exports nvim to ~/.local/bin/nvim

toolbox unexport --app gimp --container Arch
→ Removes the exported .desktop file

toolbox unexport --all --container Arch
→ Removes all exported items for container Arch

Fixes #1018

softwarefactory-project-zuul · 2025-07-12T18:27:22Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/becbb412b82a4850b187335a956bca4e

❌ unit-test FAILURE in 5m 27s
❌ unit-test-migration-path-for-coreos-toolbox FAILURE in 3m 43s
❌ unit-test-restricted FAILURE in 5m 34s
❌ system-test-fedora-rawhide-commands-options TIMED_OUT in 2h 00m 30s
❌ system-test-fedora-rawhide-runtime-environment-arch-fedora TIMED_OUT in 2h 00m 29s
❌ system-test-fedora-rawhide-runtime-environment-ubuntu TIMED_OUT in 2h 00m 23s
✔️ system-test-fedora-42-commands-options SUCCESS in 1h 14m 42s
✔️ system-test-fedora-42-runtime-environment-arch-fedora SUCCESS in 1h 01m 10s
✔️ system-test-fedora-42-runtime-environment-ubuntu SUCCESS in 16m 34s
✔️ system-test-fedora-41-commands-options SUCCESS in 1h 15m 11s
✔️ system-test-fedora-41-runtime-environment-arch-fedora SUCCESS in 1h 03m 23s
✔️ system-test-fedora-41-runtime-environment-ubuntu SUCCESS in 16m 56s

softwarefactory-project-zuul · 2025-07-12T22:27:07Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/5320d91732b44bfe8c0e1336ada6528b

softwarefactory-project-zuul · 2025-07-13T12:10:32Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/706a67e331f543e39545c95c2ee71c32

❌ unit-test FAILURE in 5m 06s
❌ unit-test-migration-path-for-coreos-toolbox FAILURE in 3m 35s
❌ unit-test-restricted FAILURE in 5m 56s
❌ system-test-fedora-rawhide-commands-options TIMED_OUT in 2h 00m 28s
❌ system-test-fedora-rawhide-runtime-environment-arch-fedora TIMED_OUT in 2h 00m 23s
❌ system-test-fedora-rawhide-runtime-environment-ubuntu TIMED_OUT in 2h 00m 24s
❌ system-test-fedora-42-commands-options FAILURE in 1h 22m 13s
✔️ system-test-fedora-42-runtime-environment-arch-fedora SUCCESS in 1h 04m 03s
✔️ system-test-fedora-42-runtime-environment-ubuntu SUCCESS in 17m 57s
❌ system-test-fedora-41-commands-options FAILURE in 1h 15m 29s
✔️ system-test-fedora-41-runtime-environment-arch-fedora SUCCESS in 1h 04m 16s
✔️ system-test-fedora-41-runtime-environment-ubuntu SUCCESS in 18m 16s

softwarefactory-project-zuul · 2025-07-13T12:22:07Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/de11be95c9df4598a077ad96f7270b9e

❌ unit-test FAILURE in 5m 40s
❌ unit-test-migration-path-for-coreos-toolbox FAILURE in 3m 40s
❌ unit-test-restricted FAILURE in 5m 19s
❌ system-test-fedora-rawhide-commands-options TIMED_OUT in 2h 00m 25s
❌ system-test-fedora-rawhide-runtime-environment-arch-fedora TIMED_OUT in 2h 00m 24s
❌ system-test-fedora-rawhide-runtime-environment-ubuntu TIMED_OUT in 2h 00m 29s
❌ system-test-fedora-42-commands-options FAILURE in 1h 20m 24s
✔️ system-test-fedora-42-runtime-environment-arch-fedora SUCCESS in 1h 10m 43s
✔️ system-test-fedora-42-runtime-environment-ubuntu SUCCESS in 16m 40s
❌ system-test-fedora-41-commands-options FAILURE in 1h 20m 26s
✔️ system-test-fedora-41-runtime-environment-arch-fedora SUCCESS in 1h 10m 51s
✔️ system-test-fedora-41-runtime-environment-ubuntu SUCCESS in 18m 01s

silverhadch · 2025-07-14T20:29:59Z

TODO: Use runCommand rather then calling toolbox binary from toolbox thats ugly.

softwarefactory-project-zuul · 2025-07-17T07:47:27Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/6cd6bf2635064da5a3d0bd9e5b7993f4

softwarefactory-project-zuul · 2025-07-17T10:42:22Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/20941f093c8b4674a3dbe6fc666581ef

silverhadch · 2025-07-27T19:15:56Z

@debarshiray
Rebased it and removed Merge Commits. Check this out.

softwarefactory-project-zuul · 2025-07-27T20:41:49Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/bf418eb23a6546bf92dd946bfe70083a

silverhadch · 2025-08-08T05:22:24Z

@debarshiray
This too. This feature downstream in KDE Kontainer is 400 lines of Code which can be borthersome now that we want to refactor, polish and rewrite in Kirigami. It would be nice to have our PRs merged soon since its slowing us down.

debarshiray

Thanks for working on this, @silverhadch !

I have historically avoided adding this feature to Toolbx and stopped at adding the run command because I was apprehensive of muddying our Flatpak story - that Flatpak is for shipping graphical desktop applications, and Toolbx is for software development and troubleshooting the host OS.

A few days ago, I spoke to @alexlarsson about this again, because we had a similar discussion when the run command was added. He gave his blessing, so we are free to go, as far as I am concerned. :)

I am leaving for a two week vacation tomorrow, which meant that I had a ton of miscellaneous things to wrap up before leaving, and kept failing to get to this pull request. My apologies for that.

However, I didn't want to leave you hanging for another two weeks. So, while I didn't get the chance to try out and test your PR, I wanted to say that we will move it forward once I am back, and then into a release.

src/cmd/utils.go

softwarefactory-project-zuul · 2025-08-13T08:36:58Z

Build succeeded.
https://softwarefactory-project.io/zuul/t/local/buildset/c79e9d104434454db27689a4f0517c52

softwarefactory-project-zuul · 2025-08-14T20:11:58Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/897e58c58f5d4f2580db150904ef3258

✔️ unit-test SUCCESS in 2m 10s
✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 42s
✔️ unit-test-restricted SUCCESS in 2m 13s
❌ system-test-fedora-rawhide-commands-options FAILURE in 1h 07m 00s
✔️ system-test-fedora-rawhide-runtime-environment-arch-fedora SUCCESS in 39m 52s
✔️ system-test-fedora-rawhide-runtime-environment-ubuntu SUCCESS in 10m 57s
❌ system-test-fedora-42-commands-options FAILURE in 1h 38m 33s
✔️ system-test-fedora-42-runtime-environment-arch-fedora SUCCESS in 1h 13m 27s
✔️ system-test-fedora-42-runtime-environment-ubuntu SUCCESS in 18m 39s
❌ system-test-fedora-41-commands-options FAILURE in 1h 38m 46s
✔️ system-test-fedora-41-runtime-environment-arch-fedora SUCCESS in 1h 07m 12s
✔️ system-test-fedora-41-runtime-environment-ubuntu SUCCESS in 21m 02s

softwarefactory-project-zuul · 2025-08-15T08:55:11Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/777711f79cf449c183173ba64a0fc27b

softwarefactory-project-zuul · 2025-08-15T18:37:12Z

Build failed.
https://softwarefactory-project.io/zuul/t/local/buildset/61de7f04038242bea05d0e3a821b3610

silverhadch · 2025-08-15T19:38:46Z

Gofmt is screaming at my Code. But i am also on vacation so screw you!

softwarefactory-project-zuul · 2025-08-15T21:43:36Z

Build succeeded.
https://softwarefactory-project.io/zuul/t/local/buildset/8d8d8114890249e6b716a83a37d9e339

silverhadch · 2025-08-16T05:59:13Z

Build succeeded. https://softwarefactory-project.io/zuul/t/local/buildset/8d8d8114890249e6b716a83a37d9e339

✔️ unit-test SUCCESS in 3m 42s ✔️ unit-test-migration-path-for-coreos-toolbox SUCCESS in 3m 59s ✔️ unit-test-restricted SUCCESS in 2m 43s ✔️ system-test-fedora-rawhide-commands-options SUCCESS in 1h 02m 41s ✔️ system-test-fedora-rawhide-runtime-environment-arch-fedora SUCCESS in 41m 21s ✔️ system-test-fedora-rawhide-runtime-environment-ubuntu SUCCESS in 9m 09s ✔️ system-test-fedora-42-commands-options SUCCESS in 1h 38m 27s ✔️ system-test-fedora-42-runtime-environment-arch-fedora SUCCESS in 1h 13m 45s ✔️ system-test-fedora-42-runtime-environment-ubuntu SUCCESS in 18m 07s ✔️ system-test-fedora-41-commands-options SUCCESS in 1h 41m 02s ✔️ system-test-fedora-41-runtime-environment-arch-fedora SUCCESS in 1h 08m 15s ✔️ system-test-fedora-41-runtime-environment-ubuntu SUCCESS in 17m 59s

🚀
The Test are working as intended.

Signed-off-by: Hadi Chokr <[email protected]>

toolbox Signed-off-by: Hadi Chokr <[email protected]>

Signed-off-by: Hadi Chokr <[email protected]>

We forgot to create the .local/bin directory in $HOME when calling exportBinary unlike exportApplication, where we make sure we create .local/share/applications. Signed-off-by: Hadi Chokr <[email protected]>

Signed-off-by: Hadi Chokr <[email protected]>

… subcommand and use a custom runCommand to supress stdout to the host Console. Signed-off-by: Hadi Chokr <[email protected]>

Signed-off-by: Hadi Chokr <[email protected]>

softwarefactory-project-zuul · 2025-08-18T19:27:55Z

Build succeeded.
https://softwarefactory-project.io/zuul/t/local/buildset/863076549dfe48e9aacce551804b4061

silverhadch requested a review from debarshiray as a code owner July 12, 2025 16:19

silverhadch force-pushed the kde-kontainer branch from 211b7d9 to ddf29ce Compare July 12, 2025 16:24

silverhadch mentioned this pull request Jul 12, 2025

Automatically add .desktop files in toolbox to the host #1018

Open

silverhadch marked this pull request as draft July 12, 2025 16:54

silverhadch force-pushed the kde-kontainer branch 2 times, most recently from 1c0c994 to 4486a70 Compare July 13, 2025 10:19

silverhadch marked this pull request as ready for review July 13, 2025 10:21

silverhadch marked this pull request as draft July 14, 2025 20:29

silverhadch marked this pull request as ready for review July 17, 2025 09:23

silverhadch force-pushed the kde-kontainer branch from 82a1dd0 to 01ee80f Compare July 27, 2025 19:14

debarshiray reviewed Aug 12, 2025

View reviewed changes

src/cmd/utils.go Outdated Show resolved Hide resolved

silverhadch requested a review from debarshiray August 15, 2025 07:37

silverhadch marked this pull request as draft August 16, 2025 19:37

silverhadch added 28 commits August 18, 2025 20:46

Update unexport.go

3054161

Signed-off-by: Hadi Chokr <[email protected]>

Update toolbox-export.1.md

4ec89ed

Signed-off-by: Hadi Chokr <[email protected]>

Update toolbox-unexport.1.md

f84d5f8

Signed-off-by: Hadi Chokr <[email protected]>

Update toolbox.1.md

4805d70

Signed-off-by: Hadi Chokr <[email protected]>

Import Utils

e4e414a

Signed-off-by: Hadi Chokr <[email protected]>

Add helper function for deletion

2c8ae21

Signed-off-by: Hadi Chokr <[email protected]>

Unexport on Delete

8f66ed2

Signed-off-by: Hadi Chokr <[email protected]>

Add flagcompletion to --container flag

849f064

Signed-off-by: Hadi Chokr <[email protected]>

Use new RunCommandwithOutput Function instead of calling toolbox from

967f5c5

toolbox Signed-off-by: Hadi Chokr <[email protected]>

Format Code properly

257af25

Signed-off-by: Hadi Chokr <[email protected]>

Update utils.go

83e1f21

Signed-off-by: Hadi Chokr <[email protected]>

Update utils.go

96c0f8f

Signed-off-by: Hadi Chokr <[email protected]>

Try Tests.

2c7f7d2

Signed-off-by: Hadi Chokr <[email protected]>

Try Tests again

3022520

Signed-off-by: Hadi Chokr <[email protected]>

Fix Test Failure due to missing .local/bin

6f372f0

We forgot to create the .local/bin directory in $HOME when calling exportBinary unlike exportApplication, where we make sure we create .local/share/applications. Signed-off-by: Hadi Chokr <[email protected]>

Fix Test

2a39b48

Signed-off-by: Hadi Chokr <[email protected]>

Fix Test 2

66ecdcd

Signed-off-by: Hadi Chokr <[email protected]>

Add missing asert

c913579

Signed-off-by: Hadi Chokr <[email protected]>

Update unexport.go

2e8f6fc

Signed-off-by: Hadi Chokr <[email protected]>

Update export.go

b70a94d

Signed-off-by: Hadi Chokr <[email protected]>

Add Test

534e56d

Signed-off-by: Hadi Chokr <[email protected]>

Hot fix: Discard invalid output from the run with output.

75e418e

Signed-off-by: Hadi Chokr <[email protected]>

Hot fix: Regression when removing.

fbe46ca

Signed-off-by: Hadi Chokr <[email protected]>

Fix Tests.

fcf28d4

Signed-off-by: Hadi Chokr <[email protected]>

Make Unit test happy again.

a276d3f

Signed-off-by: Hadi Chokr <[email protected]>

Use a pipe to temp file to cleanly capture required output for export…

e1b2270

… subcommand and use a custom runCommand to supress stdout to the host Console. Signed-off-by: Hadi Chokr <[email protected]>

Make Unit-test happy... again.

1e4fcdd

Signed-off-by: Hadi Chokr <[email protected]>

Make Unit-test happy... again... again

d2f2592

Signed-off-by: Hadi Chokr <[email protected]>

silverhadch force-pushed the kde-kontainer branch from 6b3e6f2 to d2f2592 Compare August 18, 2025 17:48

Add export and unexport commands for desktop and CLI integration #1682

Are you sure you want to change the base?

Add export and unexport commands for desktop and CLI integration #1682

Uh oh!

Conversation

silverhadch commented Jul 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

softwarefactory-project-zuul bot commented Jul 12, 2025

Uh oh!

softwarefactory-project-zuul bot commented Jul 12, 2025

Uh oh!

softwarefactory-project-zuul bot commented Jul 13, 2025

Uh oh!

softwarefactory-project-zuul bot commented Jul 13, 2025

Uh oh!

silverhadch commented Jul 14, 2025

Uh oh!

softwarefactory-project-zuul bot commented Jul 17, 2025

Uh oh!

softwarefactory-project-zuul bot commented Jul 17, 2025

Uh oh!

silverhadch commented Jul 27, 2025

Uh oh!

softwarefactory-project-zuul bot commented Jul 27, 2025

Uh oh!

silverhadch commented Aug 8, 2025

Uh oh!

debarshiray left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

softwarefactory-project-zuul bot commented Aug 13, 2025

Uh oh!

softwarefactory-project-zuul bot commented Aug 14, 2025

Uh oh!

softwarefactory-project-zuul bot commented Aug 15, 2025

Uh oh!

softwarefactory-project-zuul bot commented Aug 15, 2025

Uh oh!

silverhadch commented Aug 15, 2025

Uh oh!

softwarefactory-project-zuul bot commented Aug 15, 2025

Uh oh!

silverhadch commented Aug 16, 2025

Uh oh!

softwarefactory-project-zuul bot commented Aug 18, 2025

Uh oh!

Uh oh!

silverhadch commented Jul 12, 2025 •

edited

Loading