Skip to content

Fix bar::units-shell / bar::lx-shell on hosts without script(1) #63

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

Open
keithharvey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bar::units-shell / bar::lx-shell on hosts without script(1) #63

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
11 changes: 3 additions & 8 deletions scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ enter_distrobox() {
fi
}

# run a single interactive command inside the distrobox with a real PTY.
# script(1) is the PTY wrapper; it parses its arg via /bin/sh, hence printf %q.
# run a single interactive command inside the distrobox; distrobox enter
# allocates the tty itself when the caller has one
distrobox_exec_interactive() {
if _in_container; then
exec "$@"
Expand All @@ -242,10 +242,5 @@ distrobox_exec_interactive() {
err "DEVTOOLS_DISTROBOX not set. Run: just setup::distrobox"
return 1
fi
local quoted_box quoted_cmd="" arg
quoted_box="$(printf '%q' "$DEVTOOLS_DISTROBOX")"
for arg in "$@"; do
quoted_cmd+=" $(printf '%q' "$arg")"
done
exec script -qec "distrobox enter ${quoted_box} --${quoted_cmd}" /dev/null
exec distrobox enter "$DEVTOOLS_DISTROBOX" -- "$@"
}