Add code to ignore packages that have no version

Author: lupraxus

CHANGELOG.md

@@ -5,9 +5,15 @@ All notable changes to this project will be documented in this file.
 
 This changelog was automatically generated using [Caretaker](https://github.com/DevelopersToolbox/caretaker) by [Wolf Software](https://github.com/WolfSoftware)
 
+### [v0.1.1](https://github.com/DockerToolbox/version-helper/compare/v0.1.0...v0.1.1)
+
+> Released on May, 24th 2021
+
+- Add code to ignore packages that have no version [`[head]`](https://github.com/DockerToolbox/version-helper/commit/)
+
 ### [v0.1.0](https://github.com/DockerToolbox/version-helper/releases/v0.1.0)
 
 > Released on February, 19th 2021
 
-- The initial commit [`[head]`](https://github.com/DockerToolbox/version-helper/commit/)
+- The initial commit [`[03d4495]`](https://github.com/DockerToolbox/version-helper/commit/03d44954e6b185a749c7168fe6502a12aa6f9508)
 

README.md

@@ -94,6 +94,8 @@ docker run --rm -v "${GRABBER_SCRIPT}":/version-grabber --env-file="${CONFIG_FIL
 
 This is a set of example output using the same [config file](config/config.example) but different operating systems, each time we let the tag default to latest.
 
+> If no version can be found then the package is omitted from the list.
+
 ### Alpine
 
 ```shell

VERSION.txt

@@ -1 +1 @@
-0.1.0
+0.1.1

src/get-versions.sh

@@ -25,8 +25,10 @@ PREREQ_COMMANDS=( "docker" )
 # A set of global flags that we use for configuration.                             #
 # -------------------------------------------------------------------------------- #
 
+NO_HEADERS=false
 USE_COLOURS=true                 # Should we use colours in our output ?
 WIDTH=120
+
 # -------------------------------------------------------------------------------- #
 # The wrapper function                                                             #
 # -------------------------------------------------------------------------------- #
@@ -56,8 +58,9 @@ function usage()
     fi
 
 cat <<EOF
-  Usage: $0 [ -h ] [ -c value ] [ -g value ] [ -o value ] [ -s value ] [ -t value ]
+  Usage: $0 [ -h ] [ -p ] [ -c value ] [ -g value ] [ -o value ] [ -s value ] [ -t value ]
     -h    : Print this screen
+    -p    : Package list only (No headers or other information)
     -c    : config file name (including path)
     -g    : version grabber script (including path) [Default: ~/bin/version-grabber.sh]
     -o    : which operating system to use (docker container)
@@ -82,11 +85,14 @@ function process_arguments()
         usage
     fi
 
-    while getopts ":hc:g:o:s:t:" arg; do
+    while getopts ":hpc:g:o:s:t:" arg; do
         case $arg in
             h)
                 usage
                 ;;
+            p)
+                NO_HEADERS=true
+                ;;
             c)
                 CONFIG_FILE=$(realpath "${OPTARG}")
                 if [[ ! -r "${CONFIG_FILE}" ]]; then
@@ -231,15 +237,18 @@ function show_success()
 
 function draw_header
 {
-    local config_string_raw config_string
-    config_string_raw="Config File: $(basename "${CONFIG_FILE}")  Grabber Script: $(basename "${GRABBER_SCRIPT}")  Docker Container: ${OSNAME}:${TAGNAME}  Shell: ${SHELLNAME}"
-    config_string="${green}Config File:${reset} $(basename "${CONFIG_FILE}")  ${green}Grabber Script:${reset} $(basename "${GRABBER_SCRIPT}")  ${green}Docker Container:${reset} ${OSNAME}:${TAGNAME}  ${green}Shell:${reset} ${SHELLNAME}"
+    if [[ "${NO_HEADERS}" = false ]]; then
 
-    draw_line
-    center_text "Docker package version grabber"
-    draw_line
-    center_text "${config_string}" "${#config_string_raw}"
-    draw_line
+        local config_string_raw config_string
+        config_string_raw="Config File: $(basename "${CONFIG_FILE}")  Grabber Script: $(basename "${GRABBER_SCRIPT}")  Docker Container: ${OSNAME}:${TAGNAME}  Shell: ${SHELLNAME}"
+        config_string="${green}Config File:${reset} $(basename "${CONFIG_FILE}")  ${green}Grabber Script:${reset} $(basename "${GRABBER_SCRIPT}")  ${green}Docker Container:${reset} ${OSNAME}:${TAGNAME}  ${green}Shell:${reset} ${SHELLNAME}"
+
+        draw_line
+        center_text "Docker package version grabber"
+        draw_line
+        center_text "${config_string}" "${#config_string_raw}"
+        draw_line
+    fi
 }
 
 # -------------------------------------------------------------------------------- #
@@ -281,13 +290,16 @@ function center_text()
 
 function draw_line()
 {
-    local start=$'\e(0' end=$'\e(B' line='qqqqqqqqqqqqqqqq'
+    if [[ "${NO_HEADERS}" = false ]]; then
 
-    while ((${#line} < "${WIDTH}"));
-    do
-        line+="$line";
-    done
-    printf '%s%s%s\n' "$start" "${line:0:WIDTH}" "$end"
+        local start=$'\e(0' end=$'\e(B' line='qqqqqqqqqqqqqqqq'
+
+        while ((${#line} < "${WIDTH}"));
+        do
+            line+="$line";
+        done
+        printf '%s%s%s\n' "$start" "${line:0:WIDTH}" "$end"
+    fi
 }
 
 

src/version-grabber.sh

@@ -29,7 +29,9 @@ function get_apk_versions()
 
         for package in $packages; do
             version=$(apk policy "${package}" 2>/dev/null | sed -n 2p | sed 's/:$//g' | sed 's/^[[:space:]]*//')
-            output="${output}\\t\t$package=$version \\ \n"
+            if [[ -n "${version}" ]]; then
+                output="${output}\\t\t$package=$version \\ \n"
+            fi
         done
         output=${output::-5}
         echo -e "${output}"
@@ -57,7 +59,9 @@ function get_apt_versions()
 
         for package in $packages; do
             version=$(apt-cache policy "${package}" 2>/dev/null | grep 'Candidate:' | awk -F ' ' '{print $2}')
-            output="${output}\t\t$package=$version \\ \n"
+            if [[ -n "${version}" ]]; then
+                output="${output}\t\t$package=$version \\ \n"
+            fi
         done
         output=${output::-5}
         echo -e "${output}"
@@ -85,7 +89,9 @@ function get_yum_versions()
 
         for package in $packages; do
             version=$(yum info "${package}" 2>/dev/null | grep '^Version' | head -n 1 | awk -F ' : ' '{print $2}')
-            output="${output}\t\t$package-$version \\ \n"
+            if [[ -n "${version}" ]]; then
+                output="${output}\t\t$package-$version \\ \n"
+            fi
         done
         output=${output::-5}
         echo -e "${output}"