diff --git a/recipes/recipe_check_packages.sh b/recipes/recipe_check_packages.sh index c82fa90..48de7f0 100755 --- a/recipes/recipe_check_packages.sh +++ b/recipes/recipe_check_packages.sh @@ -23,35 +23,35 @@ do else #echo ${result} # If package is installed - if [[ ${result} == *"[ebuild R"*"${package}"* ]] + if [[ ${result} == *"[ebuild R"*"${package}"* ]] || [ ${result} == *"[binary R"*"${package}"* ]] then echo -e "${GREEN}Package ${package} INSTALLED : check OK${NC}" # If package reinstall forced for some reason - elif [[ ${result} == *"[ebuild r"*"${package}"* ]] + elif [[ ${result} == *"[ebuild r"*"${package}"* ]] || [[ ${result} == *"[binary r"*"${package}"* ]] then echo -e "${GREEN}Package ${package} INSTALLED BUT reinstall forced for some reason : check OK${NC}\n" # If package need to be installed - elif [[ ${result} == *"[ebuild N"*"${package}"* ]] + elif [[ ${result} == *"[ebuild N"*"${package}"* ]] || [[ ${result} == *"[binary N"*"${package}"* ]] then echo -e "${RED}Package ${package} NOT INSTALLED (New) : check KO${NC}" PACKAGES_TO_CHECK=${PACKAGES_TO_CHECK}" ${package}" # If package updating to another version - elif [[ ${result} == *"[ebuild U"*"${package}"* ]] + elif [[ ${result} == *"[ebuild U"*"${package}"* ]] || [[ ${result} == *"[binary U"*"${package}"* ]] then echo -e "${RED}Package ${package} INSTALLED BUT updating to another version (Updating) : check OK${NC}" PACKAGES_TO_CHECK=${PACKAGES_TO_CHECK}" ${package}" # If package best version seems lower - elif [[ ${result} == *"[ebuild D"*"${package}"* ]] + elif [[ ${result} == *"[ebuild D"*"${package}"* ]] || [[ ${result} == *"[binary D"*"${package}"* ]] then echo -e "${RED}Package ${package} INSTALLED BUT best version seems lower (Downgrading) : check OK${NC}" PACKAGES_TO_CHECK=${PACKAGES_TO_CHECK}" ${package}" # If package blocked - elif [[ ${result} == *"[ebuild B"*"${package}"* ]] + elif [[ ${result} == *"[ebuild B"*"${package}"* ]] || [[ ${result} == *"[binary B"*"${package}"* ]] then echo -e "${RED}Package ${package} NOT INSTALLED (Block) unresolved conflict : check KO${NC}" PACKAGES_TO_CHECK=${PACKAGES_TO_CHECK}" ${package}" # If package blocked but auto resolved conflict - elif [[ ${result} == *"[ebuild b"*"${package}"* ]] + elif [[ ${result} == *"[ebuild b"*"${package}"* ]] || [[ ${result} == *"[binary b"*"${package}"* ]] then echo -e "${RED}Package ${package} NOT INSTALLED (Block) but auto resolved conflict : check KO${NC}" PACKAGES_TO_CHECK=${PACKAGES_TO_CHECK}" ${package}"