mirror of
https://github.com/mag37/dockcheck.git
synced 2026-04-19 02:47:45 +00:00
PkgInstaller bug, reformatted
This commit is contained in:
12
dockcheck.sh
12
dockcheck.sh
@@ -269,12 +269,16 @@ dependency_check() {
|
|||||||
[[ "$GetBin" =~ [yY] ]] && distro_checker
|
[[ "$GetBin" =~ [yY] ]] && distro_checker
|
||||||
if [[ -n "${PkgInstaller:-}" && "${PkgInstaller:-}" != "ERROR" ]]; then
|
if [[ -n "${PkgInstaller:-}" && "${PkgInstaller:-}" != "ERROR" ]]; then
|
||||||
[[ $(uname -s) == "Darwin" && "$AppName" == "regctl" ]] && AppName="regclient"
|
[[ $(uname -s) == "Darwin" && "$AppName" == "regctl" ]] && AppName="regclient"
|
||||||
("$PkgInstaller" "$AppName"); PkgExitcode="$?" && AppName="$1"
|
if $PkgInstaller "$AppName"; then
|
||||||
if [[ "$PkgExitcode" == 0 ]]; then { export "$AppVar"="$AppName" && printf "\n%b%b installed.%b\n" "$c_green" "$AppName" "$c_reset"; }
|
AppName="$1"
|
||||||
else printf "\n%bPackagemanager install failed%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
|
export "$AppVar"="$AppName"
|
||||||
|
printf "\n%b%b installed.%b\n" "$c_green" "$AppName" "$c_reset"
|
||||||
|
else
|
||||||
|
PkgExitcode="ERROR"
|
||||||
|
printf "\n%bPackagemanager install failed%b, falling back to static binary.\n" "$c_yellow" "$c_reset"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ "$GetBin" =~ [sS] || "$PkgInstaller" == "ERROR" || "$PkgExitcode" != 0 ]]; then
|
if [[ "$GetBin" =~ [sS] || "$PkgInstaller" == "ERROR" ]]; then
|
||||||
binary_downloader "$AppName" "$AppUrl"
|
binary_downloader "$AppName" "$AppUrl"
|
||||||
[[ -f "$ScriptWorkDir/$AppName" ]] && { export "$AppVar"="$ScriptWorkDir/$1" && printf "\n%b%b downloaded.%b\n" "$c_green" "$AppName" "$c_reset"; }
|
[[ -f "$ScriptWorkDir/$AppName" ]] && { export "$AppVar"="$ScriptWorkDir/$1" && printf "\n%b%b downloaded.%b\n" "$c_green" "$AppName" "$c_reset"; }
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user