From 7ea820dde34b289a517219771ea3a02344d887f6 Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Mon, 22 Aug 2022 17:13:52 +0300
Subject: [PATCH] Improve logging and save driver under the same package

---
 scripts/cache-google-chrome | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/scripts/cache-google-chrome b/scripts/cache-google-chrome
index 99a9ebd..f8d29c2 100755
--- a/scripts/cache-google-chrome
+++ b/scripts/cache-google-chrome
@@ -12,19 +12,20 @@ function save-package() {
   local PKG=$1
   local DEB=$2
   local LATEST_VERSION=$3
-  local SOURCE_DEB=${4:-$DEB}
+  local REGISTRY_PACKAGE=${4:-$PKG}
+  local SOURCE_DEB=${5:-$DEB}
 
-  local URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PKG}/${LATEST_VERSION}/${DEB}"
+  local URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${REGISTRY_PACKAGE}/${LATEST_VERSION}/${DEB}"
 
-  echo "Checking if cache has ${DEB}"
+  echo "Checking if ${PKG} v${LATEST_VERSION} is already cached"
   local FILE_CHECK=$(curl --silent --location --head --output /dev/null --write "%{http_code}\\n" "$URL")
 
   if [ "$FILE_CHECK" -eq "200" ]; then
-    echo "Latest version ${LATEST_VERSION} is already cached!"
+    echo "${PKG} v${LATEST_VERSION} is already cached!"
   else
-    echo "Downloading latest ${PKG} version (${LATEST_VERSION}) in apt repository..."
+    echo "Downloading latest ${PKG} version (${LATEST_VERSION}) from apt repository..."
     cd /tmp
-    apt-get download $PKG
+    apt-get download "$PKG"
 
     if ! [ -f "${SOURCE_DEB}" ]; then
       echo "Downloaded file didn't have expected name: ${SOURCE_DEB}"
@@ -36,7 +37,7 @@ function save-package() {
       mv "$SOURCE_DEB" "$DEB"
     fi
 
-    echo "Transferring $PKG to GitLab packages"
+    echo "Transferring ${PKG} v${LATEST_VERSION} to GitLab packages"
     curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
       --upload-file "./{$DEB}" \
       "$URL"
@@ -46,15 +47,12 @@ function save-package() {
 function cache-chrome() {
   PKG=google-chrome-stable
 
+  echo "Updating apt to get Google Chrome packages..."
   curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
   echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google.list
-
-  echo "Updating apt to get Google Chrome packages..."
-
   apt-get -y -qq update
 
-  echo "Checking for latest Chrome version in apt repository..."
-
+  echo "Checking for latest '${PKG}' version in apt repository..."
   LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //")
   CHROME_DEB="google-chrome-stable_${LATEST_VERSION}_amd64.deb"
 
@@ -65,15 +63,15 @@ function cache-chromium() {
   PKG=chromium
   PKG_DRIVER=chromium-driver
 
-  echo "Checking for latest Chromium version in apt repository..."
-
+  echo "Checking for latest '${PKG}' version in apt repository..."
   LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //")
   VERSION_NUMBER=$(echo $LATEST_VERSION | sed -e "s/~deb.*//") # remove debian version part to have chrome and chromium compatible version numbers
   CHROMIUM_DEB="${PKG}_${VERSION_NUMBER}_arm64.deb"
   CHROMIUM_DRIVER_DEB="${PKG_DRIVER}_${VERSION_NUMBER}_arm64.deb"
   
-  save-package "$PKG" "$CHROMIUM_DEB" "$VERSION_NUMBER" "${PKG}_${LATEST_VERSION}_arm64.deb"
-  save-package "$PKG_DRIVER" "$CHROMIUM_DRIVER_DEB" "$VERSION_NUMBER" "${PKG_DRIVER}_${LATEST_VERSION}_arm64.deb"
+  # Save both chromium and chromium-driver under the same package
+  save-package "$PKG" "$CHROMIUM_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG}_${LATEST_VERSION}_arm64.deb"
+  save-package "$PKG_DRIVER" "$CHROMIUM_DRIVER_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG_DRIVER}_${LATEST_VERSION}_arm64.deb"
 }
 
 echo "Updating system utils"