Skip to content

Commit

Permalink
assemble: add support for declaring exported apps and binaries, Fix #842
Browse files Browse the repository at this point in the history


Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
  • Loading branch information
89luca89 committed Aug 5, 2023
1 parent c4c4766 commit a9c9438
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 0 deletions.
19 changes: 19 additions & 0 deletions distrobox-assemble
Expand Up @@ -47,6 +47,9 @@ start_now=""
unshare_ipc=""
unshare_netns=""
volume=""
exported_apps=""
exported_bins=""
exported_bins_path="${HOME}/.local/bin"

# Cleanup tmpfiles on exit
trap 'rm -f ${tmpfile}' EXIT
Expand Down Expand Up @@ -314,6 +317,22 @@ run_distrobox() (
if [ -n "${start_now}" ] && [ "${start_now}" -eq 1 ]; then
"${distrobox_path}"/distrobox enter "${name}" -- touch /dev/null
fi

# if there are exported bins and apps declared, let's export them
if [ -n "${exported_apps}" ] || [ -n "${exported_bins}" ]; then
# First we start the container
"${distrobox_path}"/distrobox enter "${name}" -- touch /dev/null

IFS=" "
for app in ${exported_apps}; do
"${distrobox_path}"/distrobox enter "${name}" -- distrobox-export --app "${app}"
done

IFS=" "
for bin in ${exported_bins}; do
"${distrobox_path}"/distrobox enter "${name}" -- distrobox-export --bin "${bin}" --export-path "${exported_bins_path}"
done
fi
)

# Sanitize an input, add single/double quotes and escapes
Expand Down
3 changes: 3 additions & 0 deletions docs/usage/distrobox-assemble.md
Expand Up @@ -150,3 +150,6 @@ in order to execute them one after the other.
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/flatpak;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/podman;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/xdg-open;
exported_apps="htop"
exported_bins="/usr/bin/htop /usr/bin/git"
exported_bins_path="~/.local/bin"
3 changes: 3 additions & 0 deletions extras/distrobox-example-manifest.ini
Expand Up @@ -83,3 +83,6 @@ init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker-compose;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/flatpak;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/podman;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/xdg-open;
exported_apps="htop"
exported_bins="/usr/bin/htop /usr/bin/git"
exported_bins_path="~/.local/bin"
3 changes: 3 additions & 0 deletions man/man1/distrobox-assemble.1
Expand Up @@ -277,5 +277,8 @@ init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker-compose;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/flatpak;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/podman;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/xdg-open;
exported_apps=\[dq]htop\[dq]
exported_bins=\[dq]/usr/bin/htop /usr/bin/git\[dq]
exported_bins_path=\[dq]\[ti]/.local/bin\[dq]
\f[R]
.fi
3 changes: 3 additions & 0 deletions man/man1/distrobox.1
Expand Up @@ -277,6 +277,9 @@ init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker-compose;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/flatpak;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/podman;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/xdg-open;
exported_apps=\[dq]htop\[dq]
exported_bins=\[dq]/usr/bin/htop /usr/bin/git\[dq]
exported_bins_path=\[dq]\[ti]/.local/bin\[dq]
\f[R]
.fi
'\" t
Expand Down

0 comments on commit a9c9438

Please sign in to comment.