Browse Source

adding file checking

pull/3568/head
Daniel Gibbs 4 years ago
parent
commit
17ac5f8ada
  1. 23
      lgsm/functions/check_deps.sh
  2. 3
      lgsm/functions/core_dl.sh

23
lgsm/functions/check_deps.sh

@ -310,17 +310,20 @@ if [ ! -f "${datadir}/${distroid}-${distroversion}.csv" ]; then
fn_check_file_github "lgsm/data" "${distroid}-${distroversion}.csv"
fi
# Select Distro
dependencyinstall=$(awk -F, '$1=="install" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
dependencyall=$(awk -F, '$1=="all" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
dependencyshortname=$(awk -v shortname="$shortname" -F, '$1==shortname {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
if [ "${checkflag}" == "0" ]; then
dependencyinstall=$(awk -F, '$1=="install" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
dependencyall=$(awk -F, '$1=="all" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
dependencyshortname=$(awk -v shortname="$shortname" -F, '$1==shortname {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
# dev code
echo "${dependencyinstall}${dependencyall}${dependencyshortname}"
# dev code
echo "${dependencyinstall}${dependencyall}${dependencyshortname}"
# Generate array of missing deps.
array_deps_missing=()
# Generate array of missing deps.
array_deps_missing=()
array_deps_required=(${dependencyall} ${dependencyshortname})
fn_check_loop
array_deps_required=(${dependencyall} ${dependencyshortname})
fn_check_loop
else
fn_print_warning_nl "LinuxGSM dependency checking currently unavailable for ${distroname}."
fi

3
lgsm/functions/core_dl.sh

@ -288,12 +288,14 @@ fn_check_file(){
if [ -f "${lgsmlog}" ]; then
fn_script_log_fatal "Checking ${remote_filename}"
fn_script_log_fatal "${fileurl}"
checkflag=1
fi
else
fn_print_error_eol_nl
if [ -f "${lgsmlog}" ]; then
fn_script_log_error "Checking ${remote_filename}"
fn_script_log_error "${fileurl}"
checkflag=2
fi
fi
else
@ -302,6 +304,7 @@ fn_check_file(){
echo -en "\033[2K\\r"
if [ -f "${lgsmlog}" ]; then
fn_script_log_pass "Checking ${remote_filename}"
checkflag=0
fi
break
fi

Loading…
Cancel
Save