Update version-grabber to include && in the output to make auto-generation easier

Author: lupraxus

CHANGELOG.md

@@ -5,11 +5,17 @@ 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.2](https://github.com/DockerToolbox/version-helper/compare/v0.1.1...v0.1.2)
+
+> Released on May, 25th 2021
+
+- Update version-grabber to include && in the output to make auto-generation easier [`[head]`](https://github.com/DockerToolbox/version-helper/commit/)
+
 ### [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/)
+- Add code to ignore packages that have no version [`[acd22ac]`](https://github.com/DockerToolbox/version-helper/commit/acd22ac6dc488fd50717b97b7a6d578d84ac7532)
 
 ### [v0.1.0](https://github.com/DockerToolbox/version-helper/releases/v0.1.0)
 

README.md

@@ -105,7 +105,8 @@ RUN apk update && \
 		curl=7.74.0-r0 \ 
 		git=2.30.1-r0 \ 
 		openssl-dev=1.1.1j-r0 \ 
-		wget=1.21.1-r1
+		wget=1.21.1-r1 \
+		&& \
 ```
 
 
@@ -118,7 +119,8 @@ RUN yum makecache && \
 		curl-7.61.1 \ 
 		git-2.23.3 \ 
 		openssl-devel-1.0.2k \ 
-		wget-1.14
+		wget-1.14 \
+		&& \
 ```
 
 ### Centos
@@ -130,7 +132,8 @@ RUN yum makecache && \
 		curl-7.61.1 \ 
 		git-2.27.0 \ 
 		openssl-devel-1.1.1g \ 
-		wget-1.19.5
+		wget-1.19.5 \
+		&& \
 ```
 
 ### Debian
@@ -142,7 +145,8 @@ RUN apt-get update && \
 		curl=7.64.0-4+deb10u1 \ 
 		git=1:2.20.1-2+deb10u3 \ 
 		libssl-dev=1.1.1d-0+deb10u5 \ 
-		wget=1.20.1-1.1
+		wget=1.20.1-1.1 \
+		&& \
 ```
 
 ### Ubuntu
@@ -154,7 +158,8 @@ RUN apt-get update && \
 		curl=7.68.0-1ubuntu2.4 \ 
 		git=1:2.25.1-1ubuntu3 \ 
 		libssl-dev=1.1.1f-1ubuntu2.2 \ 
-		wget=1.20.3-1ubuntu1
+		wget=1.20.3-1ubuntu1 \
+		&& \
 ```
 
 The output is a [hadolint](https://github.com/TravisToolbox/hadolint) compliant piece of code that you can add directly to your Dockerfile, it handles the formating of the version as again different OSs require different formats.
@@ -172,7 +177,8 @@ RUN apt-get update && \
 		curl=7.47.0-1ubuntu2.18 \ 
 		git=1:2.7.4-0ubuntu1.9 \ 
 		libssl-dev=1.0.2g-1ubuntu4.19 \ 
-		wget=1.17.1-1ubuntu1.5
+		wget=1.17.1-1ubuntu1.5 \
+		&& \
 ```
 
 **Ubuntu 18.04**
@@ -184,7 +190,8 @@ RUN apt-get update && \
 		curl=7.58.0-2ubuntu3.12 \ 
 		git=1:2.17.1-1ubuntu0.7 \ 
 		libssl-dev=1.1.1-1ubuntu2.1~18.04.8 \ 
-		wget=1.19.4-1ubuntu2.2
+		wget=1.19.4-1ubuntu2.2 \
+		&& \
 ```
 
 **Ubuntu 20.04**
@@ -196,7 +203,8 @@ RUN apt-get update && \
 		curl=7.68.0-1ubuntu2.4 \ 
 		git=1:2.25.1-1ubuntu3 \ 
 		libssl-dev=1.1.1f-1ubuntu2.2 \ 
-		wget=1.20.3-1ubuntu1
+		wget=1.20.3-1ubuntu1 \
+		&& \
 ```
 
 It should be very clear to see the different versions for each of the packages.

VERSION.txt

@@ -1 +1 @@
-0.1.1
+0.1.2

src/version-grabber.sh

@@ -24,16 +24,16 @@ function get_apk_versions()
     if [[ -n "${packages}" ]]; then
         apk update > /dev/null 2>&1
 
-        output="RUN apk update && \\ \n"
-        output="${output}\\tapk add --no-cache \\ \n"
+        output="RUN apk update && \\\\\n"
+        output="${output}\\tapk add --no-cache \\\\\n"
 
         for package in $packages; do
             version=$(apk policy "${package}" 2>/dev/null | sed -n 2p | sed 's/:$//g' | sed 's/^[[:space:]]*//')
             if [[ -n "${version}" ]]; then
-                output="${output}\\t\t$package=$version \\ \n"
+                output="${output}\\t\t$package=$version \\\\\n"
             fi
         done
-        output=${output::-5}
+        output="${output}\t\t&& \\\\\n"
         echo -e "${output}"
     else
         echo " No packages have been defined."
@@ -54,16 +54,16 @@ function get_apt_versions()
     if [[ -n "${packages}" ]]; then
         apt-get update > /dev/null 2>&1
 
-        output="RUN apt-get update && \\ \n"
-        output="${output}\tapt-get -y --no-install-recommends install \\ \n"
+        output="RUN apt-get update && \\\\\n"
+        output="${output}\tapt-get -y --no-install-recommends install \\\\\n"
 
         for package in $packages; do
             version=$(apt-cache policy "${package}" 2>/dev/null | grep 'Candidate:' | awk -F ' ' '{print $2}')
             if [[ -n "${version}" ]]; then
-                output="${output}\t\t$package=$version \\ \n"
+                output="${output}\t\t$package=$version \\\\\n"
             fi
         done
-        output=${output::-5}
+        output="${output}\t\t&& \\\\\n"
         echo -e "${output}"
     else
         echo " No packages have been defined."
@@ -84,16 +84,16 @@ function get_yum_versions()
     if [[ -n "${packages}" ]]; then
         yum makecache > /dev/null 2>&1
 
-        output="RUN yum makecache && \\ \n"
-        output="${output}\tyum install -y \\ \n"
+        output="RUN yum makecache && \\\\\n"
+        output="${output}\tyum install -y \\\\\n"
 
         for package in $packages; do
             version=$(yum info "${package}" 2>/dev/null | grep '^Version' | head -n 1 | awk -F ' : ' '{print $2}')
             if [[ -n "${version}" ]]; then
-                output="${output}\t\t$package-$version \\ \n"
+                output="${output}\t\t$package-$version \\\\\n"
             fi
         done
-        output=${output::-5}
+        output="${output}\t\t&& \\\\\n"
         echo -e "${output}"
     else
         echo " No packages have been defined."