From f30fe6f08200ec32a89655e6f494f1e463006179 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov Date: Thu, 21 Sep 2023 15:06:32 +0200 Subject: [PATCH 1/2] Rename github/hub to mislav/hub Ref: https://github.com/mislav/hub/discussions/3326 --- images/linux/scripts/installers/git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index b02e020c3ecc..cd7ad7efd85a 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -39,7 +39,7 @@ echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt #Install hub tmp_hub="/tmp/hub" mkdir -p "$tmp_hub" -downloadUrl=$(get_github_package_download_url "github/hub" "contains(\"hub-linux-amd64\")") +downloadUrl=$(get_github_package_download_url "mislav/hub" "contains(\"hub-linux-amd64\")") download_with_retries "$downloadUrl" "$tmp_hub" tar xzf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" mv "$tmp_hub"/bin/hub /usr/local/bin From 685b8e96eab7f163a43548ac5a4f622df1ccdb4d Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov Date: Thu, 21 Sep 2023 15:06:48 +0200 Subject: [PATCH 2/2] Fix code style --- images/linux/scripts/installers/git.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index cd7ad7efd85a..083627b93a58 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -5,7 +5,8 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh +# shellcheck source=../helpers/install.sh +source "$HELPER_SCRIPTS/install.sh" GIT_REPO="ppa:git-core/ppa" GIT_LFS_REPO="https://packagecloud.io/install/repositories/github/git-lfs" @@ -33,8 +34,8 @@ add-apt-repository --remove $GIT_REPO rm /etc/apt/sources.list.d/github_git-lfs.list # Document apt source repo's -echo "git-core $GIT_REPO" >> $HELPER_SCRIPTS/apt-sources.txt -echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt +echo "git-core $GIT_REPO" >> "$HELPER_SCRIPTS/apt-sources.txt" +echo "git-lfs $GIT_LFS_REPO" >> "$HELPER_SCRIPTS/apt-sources.txt" #Install hub tmp_hub="/tmp/hub" @@ -48,4 +49,4 @@ mv "$tmp_hub"/bin/hub /usr/local/bin ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> /etc/ssh/ssh_known_hosts ssh-keyscan -t rsa ssh.dev.azure.com >> /etc/ssh/ssh_known_hosts -invoke_tests "Tools" "Git" \ No newline at end of file +invoke_tests "Tools" "Git"