frebib/dotfiles
1
0
Fork 0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00
Code Issues Releases Wiki Activity

aliases: fix dsh/drsh usage/error bugs

Browse Source
This commit is contained in:
Joe Groocock 2018-08-21 13:34:43 +01:00
parent 89e325c503
commit 650ff6e0c1
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
aliases
View File

@ -186,10 +186,12 @@ alias dalpine='docker run -ti --rm spritsail/alpine /bin/sh'
alias drm-stopped='docker container prune' alias drm-stopped='docker container prune'
alias drmi-untag='docker image prune' alias drmi-untag='docker image prune'
alias dprune='docker system prune -f' alias dprune='docker system prune -f'
alias dsh='_CMD=dsh _dsh exec' alias dsh='_CMD=dsh _dsh 2 exec'
alias drsh='_CMD=drsh _dsh run --rm --entrypoint=' alias drsh='_CMD=drsh _dsh 4 run --rm --entrypoint='
_dsh() { _dsh() {
if [ $# -lt 2 ]; then minargs=$1
shift
if [ $# -lt $minargs ]; then
echo "Usage: ${_CMD:-$0} [user@]container [program [args]]" >&2 echo "Usage: ${_CMD:-$0} [user@]container [program [args]]" >&2
return 64 return 64
fi fi
@ -223,18 +225,19 @@ _dsh() {
fi fi
if [ -z "$prog" ]; then if [ -z "$prog" ]; then
set -o pipefail
local rm=
if [ "$dowhat" = 'run' ]; then if [ "$dowhat" = 'run' ]; then
rm='--rm --entrypoint=' shell_args=(--rm --entrypoint=)
fi fi
for shell in bash sh; do for shell in bash sh; do
if shell_path="$(eval "docker $dowhat $rm $host which $shell" <&- | sed 's|[\r\n]||g')"; then shell_path="$(set -o pipefail; docker $dowhat ${shell_args[@]} "$host" which "$shell" <&- | sed 's|[\r\n]||g')"
retval=$?
if [ $retval -eq 0 ]; then
prog="$shell_path" prog="$shell_path"
break break
elif [ $retval -ge 125 ]; then
return
fi fi
done done
set +o pipefail
if [ -z "$prog" ]; then if [ -z "$prog" ]; then
echo "Warning: No shell found in path.. trying /bin/sh" >&2 echo "Warning: No shell found in path.. trying /bin/sh" >&2
prog=/bin/sh prog=/bin/sh