Implement fallback logic, test git-lfs 2.13.3 due to bad 3.0.0 release

Author: Chuxel

script-library/git-lfs-debian.sh

@@ -125,23 +125,7 @@ check_packages() {
     fi
 }
 
-export DEBIAN_FRONTEND=noninteractive
-
-# Install git, curl, gpg, and debian-archive-keyring if missing
-. /etc/os-release
-check_packages curl ca-certificates gnupg2 apt-transport-https
-if ! type git > /dev/null 2>&1; then
-    apt_get_update_if_needed
-    apt-get -y install --no-install-recommends git
-fi
-if [ "${ID}" = "debian" ]; then
-    check_packages debian-archive-keyring
-fi
-
-# Install Git LFS
-echo "Installing Git LFS..."
-architecture="$(dpkg --print-architecture)"
-if [[ "${GIT_LFS_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${GIT_LFS_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+install_using_apt() {
     # Soft version matching
     if [ "${GIT_LFS_VERSION}" != "latest" ] && [ "${GIT_LFS_VERSION}" != "lts" ] && [ "${GIT_LFS_VERSION}" != "stable" ]; then
         find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs"
@@ -153,10 +137,12 @@ if [[ "${GIT_LFS_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${GIT_
     get_common_setting GIT_LFS_ARCHIVE_GPG_KEY_URI
     curl -sSL "${GIT_LFS_ARCHIVE_GPG_KEY_URI}" | gpg --dearmor > /usr/share/keyrings/gitlfs-archive-keyring.gpg
     echo -e "deb [arch=${architecture} signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main\ndeb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/git-lfs.list
-    apt-get install -yq git-lfs${version_suffix}
+    apt-get install -yq git-lfs${version_suffix} || return 1
     git lfs install --skip-repo
-else
-    echo "No apt package for ${VERSION_CODENAME} ${architecture}. Installing manually."
+}
+
+install_using_github() {
+    echo "(*) No apt package for ${VERSION_CODENAME} ${architecture}. Installing manually."
     mkdir -p /tmp/git-lfs
     cd /tmp/git-lfs
     find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs"
@@ -171,6 +157,33 @@ else
     tar xf "${git_lfs_filename}" -C .
     ./install.sh
     rm -rf /tmp/git-lfs /tmp/tmp-gnupg
+}
+
+export DEBIAN_FRONTEND=noninteractive
+
+# Install git, curl, gpg, dirmngr and debian-archive-keyring if missing
+. /etc/os-release
+check_packages curl ca-certificates gnupg2 apt-transport-https dirmngr
+if ! type git > /dev/null 2>&1; then
+    apt_get_update_if_needed
+    apt-get -y install --no-install-recommends git
+fi
+if [ "${ID}" = "debian" ]; then
+    check_packages debian-archive-keyring
+fi
+
+# Install Git LFS
+echo "Installing Git LFS..."
+architecture="$(dpkg --print-architecture)"
+if [[ "${GIT_LFS_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${GIT_LFS_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+    install_using_apt || use_github="true"
+else
+    use_github="true"
+fi
+
+# If no archive exists or apt install fails, try direct from github
+if [ "${use_github}" = "true" ]; then
+    install_using_github
 fi
 
 echo "Done!"

script-library/test/regression/run-scripts.sh

@@ -74,7 +74,7 @@ if [ "${DISTRO}" = "debian" ]; then
     runScript azcli
     runScript fish "false ${USERNAME}"
     runScript git-from-src "latest true"
-    runScript git-lfs
+    runScript git-lfs "" "2.13.3"
     runScript github
     runScript go "1.14 /opt/go /go ${USERNAME} false"
     runScript gradle "4.4 /usr/local/sdkman1 ${USERNAME} false"