Some minor changes to support arch distros.
This commit is contained in:
@@ -121,6 +121,9 @@ ptlinux_resolve_dependency_packages()
|
||||
arch:openssl)
|
||||
candidates=(openssl)
|
||||
;;
|
||||
arch:umu)
|
||||
candidates=(umu-launcher)
|
||||
;;
|
||||
suse:python)
|
||||
candidates=(python3)
|
||||
;;
|
||||
@@ -210,6 +213,7 @@ ptlinux_has_wine_stack()
|
||||
ptlinux_detect_missing_dependencies()
|
||||
{
|
||||
local python_bin="${PYTHON_BIN:-python3}"
|
||||
local family="${1:-}"
|
||||
PTLINUX_MISSING_DEPENDENCIES=()
|
||||
|
||||
if ! command -v "$python_bin" >/dev/null 2>&1
|
||||
@@ -227,10 +231,6 @@ ptlinux_detect_missing_dependencies()
|
||||
then
|
||||
PTLINUX_MISSING_DEPENDENCIES+=(winetricks)
|
||||
fi
|
||||
if ! command -v gamescope >/dev/null 2>&1
|
||||
then
|
||||
PTLINUX_MISSING_DEPENDENCIES+=(gamescope)
|
||||
fi
|
||||
if ! command -v cabextract >/dev/null 2>&1
|
||||
then
|
||||
PTLINUX_MISSING_DEPENDENCIES+=(cabextract)
|
||||
@@ -239,6 +239,10 @@ ptlinux_detect_missing_dependencies()
|
||||
then
|
||||
PTLINUX_MISSING_DEPENDENCIES+=(openssl)
|
||||
fi
|
||||
if [[ "$family" == "arch" ]] && ! command -v umu-run >/dev/null 2>&1
|
||||
then
|
||||
PTLINUX_MISSING_DEPENDENCIES+=(umu)
|
||||
fi
|
||||
}
|
||||
|
||||
ptlinux_select_privilege_command()
|
||||
@@ -344,15 +348,14 @@ ptlinux_install_host_dependencies()
|
||||
local package_line
|
||||
local -a packages=()
|
||||
|
||||
ptlinux_detect_missing_dependencies
|
||||
ptlinux_read_distribution
|
||||
family="$(ptlinux_dependency_family "$PTLINUX_DISTRIBUTION_ID" "$PTLINUX_DISTRIBUTION_LIKE")"
|
||||
ptlinux_detect_missing_dependencies "$family"
|
||||
if (( ${#PTLINUX_MISSING_DEPENDENCIES[@]} == 0 ))
|
||||
then
|
||||
printf '%s\n' "All required host dependencies are already available."
|
||||
return 0
|
||||
fi
|
||||
|
||||
ptlinux_read_distribution
|
||||
family="$(ptlinux_dependency_family "$PTLINUX_DISTRIBUTION_ID" "$PTLINUX_DISTRIBUTION_LIKE")"
|
||||
if [[ "$family" == "unknown" ]]
|
||||
then
|
||||
printf 'Unsupported distribution: %s. Re-run with --skip-deps after installing: %s\n' \
|
||||
@@ -374,7 +377,7 @@ ptlinux_install_host_dependencies()
|
||||
printf '%s\n' "Installing missing host dependencies (authentication may be requested)."
|
||||
ptlinux_install_resolved_packages "$family" "${packages[@]}"
|
||||
hash -r
|
||||
ptlinux_detect_missing_dependencies
|
||||
ptlinux_detect_missing_dependencies "$family"
|
||||
if (( ${#PTLINUX_MISSING_DEPENDENCIES[@]} != 0 ))
|
||||
then
|
||||
printf 'Dependencies remain unavailable after package installation: %s\n' \
|
||||
|
||||
Reference in New Issue
Block a user