Add get_full_tag and get_path functions

Author: chorrell

functions.sh

@@ -180,6 +180,24 @@ function get_fork_name() {
   fi
 }
 
+function get_full_tag() {
+  local variant
+  local tag
+  local full_tag
+  variant="$1"
+  shift
+  tag="$1"
+  shift
+  if [ -z "${variant}" ]; then
+    full_tag="${tag}"
+  elif [ "${variant}" = "default" ]; then
+    full_tag="${tag}"
+  else
+    full_tag="${tag}-${variant}"
+  fi
+  echo "${full_tag}"
+}
+
 function get_full_version() {
   local version
   version=$1
@@ -206,6 +224,25 @@ function get_major_minor_version() {
   echo "$(echo "${fullversion}" | cut -d'.' -f1).$(echo "${fullversion}" | cut -d'.' -f2)"
 }
 
+function get_path() {
+  local version
+  local variant
+  local path
+  version="$1"
+  shift
+  variant="$1"
+  shift
+
+  if [ -z "${variant}" ]; then
+    path="${version}/${variant}"
+  elif [ "${variant}" = "default" ]; then
+    path="${version}"
+  else
+    path="${version}/${variant}"
+  fi
+  echo "${path}"
+}
+
 function get_tag() {
   local version
   version=$1

test-build.sh

@@ -27,16 +27,8 @@ function build() {
   tag="$1"
   shift
 
-  if [ -z "${variant}" ]; then
-    full_tag="${tag}"
-    path="${version}/${variant}"
-  elif [ "${variant}" = "default" ]; then
-    full_tag="${tag}"
-    path="${version}"
-  else
-    full_tag="${tag}-${variant}"
-    path="${version}/${variant}"
-  fi
+  full_tag=$(get_full_tag "${variant}" "${tag}")
+  path=$(get_path "${version}" "${variant}")
 
   info "Building ${full_tag}..."
 
@@ -51,20 +43,14 @@ function test_image() {
   local variant
   local tag
   local full_tag
-  version="$1"
+  full_version="$1"
   shift
   variant="$1"
   shift
   tag="$1"
   shift
 
-  if [ -z "${variant}" ]; then
-    full_tag="${tag}"
-  elif [ "${variant}" = "default" ]; then
-    full_tag="${tag}"
-  else
-    full_tag="${tag}-${variant}"
-  fi
+  full_tag=$(get_full_tag "${variant}" "${tag}")
 
   info "Testing ${full_tag}"
   export full_version=${full_version}