Skip to content

Commit

Permalink
Merge pull request #525 from echuber2/20240217-parser
Browse files Browse the repository at this point in the history 
Fix discrepancies in parser scripts, bad newlines in cmdrc
  • Loading branch information
@mviereck
mviereck committed Apr 4, 2024
2 parents 036a71d + 7332690 commit b9e0e76
Showing 1 changed file with 63 additions and 36 deletions.
99 changes: 63 additions & 36 deletions x11docker
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,26 +1035,30 @@ parse_inspect() { # parse json of inspect output using python
local Parserscript
local Jsonstring Keystring Output

command -v jq >/dev/null && {
[[ "$Jqbin" ]] && {
Jsonstring="${1:-}" ; shift
[ "${Jsonstring:0:1}" = "[" ] && Keystring=".[]" || Keystring=""
# If we have an array, get the first item
[[ $("$Jqbin" -r 'type' <<< "$Jsonstring" 2>/dev/null) == array ]] && Keystring=".[0]" || Keystring=""
# Recursively find key using the sequence of keys
while [ $# -gt 0 ]; do
Keystring="$Keystring.${1:-}"
shift
done
Output="$(jq "$Keystring" <<< "$Jsonstring")"
while [ "${Output:0:1}" = "[" ]; do
Output="$(jq '.[]' <<< "$Output" )"
done
Output="$("$Jqbin" "$Keystring" <<< "$Jsonstring")"
# If we have an array, single-quote each item and join with spaces
if [[ $("$Jqbin" -r 'type' <<< "$Output" 2>/dev/null) == array ]]; then
Output="$("$Jqbin" -r $'map(tostring | "\'" + . + "\'") | join(" ")' <<< "$Output" )"
fi
# If we have a string, output the raw contents without quotes
if [[ $("$Jqbin" -r 'type' <<< "$Output" 2>/dev/null) == string ]]; then
Output="$("$Jqbin" -r '.' <<< "$Output")"
fi
[ "$Output" = "null" ] && Output=""
[ "${Output:0:1}" = '"' ] && Output="${Output:1:-1}"
echo "$Output"
return
}

Parserscript="$Cachefolder/parse_inspect.py"
Parserscript="#! $Pythonbin
$(cat << EOF
Parserscript="#! $Pythonbin"$'
import json,sys
def parse_inspect(*args):
Expand All @@ -1066,38 +1070,39 @@ def parse_inspect(*args):
2..n: json keys. For second level keys provide e.g. "Config","Cmd"
Prints key value as a string.
Prints empty string if key not found.
A list is printed as a string with '' around each element.
A list is printed as a string with \'\' around each element.
"""
output=""
inspect=args[1]
inspect=inspect.strip()
if inspect[0] == "[" :
inspect=inspect[1:-2] # remove enclosing [ ]
obj=json.loads(inspect)
if "\'list\'" in str(type(obj)):
obj = obj[0]
for arg in args[2:]: # recursively find the desired object. Command.Cmd is found with args "Command" , "Cmd"
try:
obj=obj[arg]
except:
obj=""
objtype=str(type(obj))
if "'list'" in objtype:
if "\'list\'" in objtype:
for i in obj:
output=output+"'"+str(i)+"' "
output += "\'" + str(i) + "\' "
output = output.strip()
else:
output=str(obj)
output = str(obj)
if output == "None":
output=""
print(output)
parse_inspect(*sys.argv)
EOF
)"
'
echo "$Parserscript" | $Pythonbin - "$@" || warning "parse_inspect(): Error while parsing json for
${2:-} ${3:-} ${4:-} ${5:-} ${6:-} (Line $BASH_LINENO)"
}
Expand Down Expand Up @@ -5412,6 +5417,19 @@ check_backend() { # options --backend, --rootless
host) Backendbin="" ;;
esac

case "$Backend" in
docker|podman|nerdctl)
if [ -n "$Jqbin" ]; then
debugnote "check_backend(): will parse json using $Jqbin"
elif [ -n "$Pythonbin" ]; then
debugnote "check_backend(): will parse json using $Pythonbin"
else
error "x11docker needs 'jq' or 'python' to parse output of '$Backend inspect'.
Please install 'jq' or 'python' version 2.x or 3.x."
fi
;;
esac

# rootful or rootless
[ "$Backendrootless" = "no" ] && export DOCKER_HOST=
[ -z "$Backendrootless" ] && case "$Backend" in
Expand Down Expand Up @@ -5675,7 +5693,11 @@ check_image() { # get some image information

# Check WORKDIR
Imageworkdir="$(parse_inspect "$Imageinspect" "Config" "Workdir")"
debugnote "Image WORKDIR: $Workdir"
# It seems Config.Workdir is Config.WorkingDir in more recent versions?
[ -z "$Imageworkdir" ] && {
Imageworkdir="$(parse_inspect "$Imageinspect" "Config" "WorkingDir")"
}
debugnote "Image WORKDIR: $Imageworkdir"
[ -z "$Workdir" ] && [ -n "$Imageworkdir" ] && {
note "Found 'WORKDIR $Imageworkdir' in image.
You can change it with option --workdir=DIR."
Expand Down Expand Up @@ -7406,20 +7428,18 @@ done
# --runasuser commands added here
[ -n "$Runasuser" ] && {
while read Line; do
echo "
debugnote 'cmdrc: running --runsasuser command:
$Line'
"
# The echoed string containing the debugnote command should not contain a newline character
# to avoid problems with the generated cmdrc.
echo "debugnote \"cmdrc: running --runsasuser command: $Line\""
echo "
$Line
"
done <<< "$(grep . <<< "$Runasuser")"
}

echo "
debugnote \"cmdrc: Running container command:
$Containerentrypoint $Containercommand\"
"
# The echoed string containing the debugnote command should not contain a newline character
# to avoid problems with the generated cmdrc.
echo "debugnote \"cmdrc: Running container command: $Containerentrypoint $Containercommand\""
case "$Forwardstdin" in
yes) echo "$Containerentrypoint $Containercommand <$(convertpath share "$Cmdstdinfifo")" ;;
no) echo "$Containerentrypoint $Containercommand" ;;
Expand Down Expand Up @@ -8604,7 +8624,7 @@ check_console() { # check whether x11docker runs on console
id "$Hostuser" | grep -q -e "(tty)" -e "(root)" || {
unpriv "fgconsole" >/dev/null 2>&1 && Runsonconsole="yes"
}
debugnote "check_host(): Guess if running on console: $Runsonconsole"
debugnote "check_console(): Guess if running on console: $Runsonconsole"
}
check_fallback() { # --fallback
# Option --fallback
Expand Down Expand Up @@ -8749,16 +8769,22 @@ check_host() { # check host environment
#Nvidiaversion="470.74"

# check python version
Pythonbin="$(command -v jq ||:)"
[ -z "$Pythonbin" ] && Pythonbin="$(command -v python ||:)"
Pythonbin="$(command -v python ||:)"
[ -z "$Pythonbin" ] && Pythonbin="$(command -v python3 ||:)"
[ -z "$Pythonbin" ] && Pythonbin="$(command -v python2 ||:)"
case "$Backend" in
docker|podman|nerdctl)
[ -z "$Pythonbin" ] && error "x11docker needs 'jq' or 'python' to parse output
of '$Backend inspect'. Please install 'jq' or 'python' version 2.x or 3.x."
;;
esac
# check jq version
Jqbin="$(command -v jq ||:)"

# The strict check for at least one of these will happen in check_backend.
if [ -n "$Jqbin" ]; then
debugnote "check_host(): found $Jqbin"
fi
if [ -n "$Pythonbin" ]; then
debugnote "check_host(): found $Pythonbin"
fi
if [ -z "$Jqbin" ] && [ -z "$Pythonbin" ]; then
debugnote "x11docker needs 'jq' or 'python' to parse output for some backends, but neither was found."
fi

return 0
}
Expand Down Expand Up @@ -10981,6 +11007,7 @@ declare_variables() { # declare global variables
Nvidiaversion="" # --gpu: Proprietary nvidia driver version on host
Nvidiainstallerfile="" # --gpu: Proprietary nvidia driver installer for container in [...]local/share/x11docker
Pythonbin="" # path to python binary
Jqbin="" # path to jq binary

# MS Windows
Winpty="" # Path to winpty for --interactive on MS Windows
Expand Down

0 comments on commit b9e0e76

Please sign in to comment.