Andreas/dockcheck
1
0
Fork 0
mirror of https://github.com/mag37/dockcheck.git synced 2026-02-14 23:38:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

changes to jq install logic

Browse source 
Will fall back to static binary if pkgmanager install fails
or no distribution matches.
This commit is contained in:
mag37 2024-11-22 13:08:24 +01:00
parent d98d052af7
commit bbe26a0ac2
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dockcheck.sh
View file

@ -195,7 +195,7 @@ distro_checker() {
elif [[ -f /etc/redhat-release ]] ; then PkgInstaller="dnf install"
elif [[ -f /etc/SuSE-release ]] ; then PkgInstaller="zypper install"
elif [[ -f /etc/debian_version ]] ; then PkgInstaller="apt-get install"
else PkgInstaller="ERROR"
else PkgInstaller="ERROR" ; printf "%s\n" "No distribution could be determined, falling back to static binary."
fi
}
@ -209,8 +209,10 @@ else
if [[ "$GetJq" =~ [yYsS] ]] ; then
[[ "$GetJq" =~ [yY] ]] && distro_checker
if [[ -n "$PkgInstaller" && "$PkgInstaller" != "ERROR" ]] ; then
(sudo $PkgInstaller jq) # is this the best way? Rewrite so that if it fails it goes to static
else
(sudo $PkgInstaller jq) ; PkgExitcode="$?"
[[ "$PkgExitcode" != 0 ]] && printf "%s\n" "Packagemanager install failed, falling back to static binary."
fi
if [[ "$GetJq" =~ [nN] || "$PkgInstaller" == "ERROR" || "$PkgExitcode" != 0 ]] ; then
binary_downloader "jq" "https://github.com/jqlang/jq/releases/latest/download/jq-linux-TEMP"
[[ -f "$ScriptWorkDir/jq" ]] && jqbin="$ScriptWorkDir/jq"
fi