From 30dc48c0edbe81ad046f73e3f1eada91aa62eb52 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:35:01 +0000 Subject: [PATCH] more echos --- src/rstudio-server/install.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/rstudio-server/install.sh b/src/rstudio-server/install.sh index 096e354..aa005c0 100755 --- a/src/rstudio-server/install.sh +++ b/src/rstudio-server/install.sh @@ -98,6 +98,7 @@ check_r() { install_rstudio() { local version=$1 local deb_file="rstudio-server.deb" + local install_url local architecture architecture="$(dpkg --print-architecture)" @@ -105,10 +106,17 @@ install_rstudio() { pushd /tmp/rstudio-server if [[ "${version}" == "stable" ]] || [[ "${version}" == "preview" ]] || [[ "${version}" == "daily" ]]; then - curl -sLo "${deb_file}" "https://rstudio.org/download/latest/${version}/server/${UBUNTU_CODENAME}/rstudio-server-latest-${architecture}.deb" + install_url="https://rstudio.org/download/latest/${version}/server/${UBUNTU_CODENAME}/rstudio-server-latest-${architecture}.deb" + echo "Download from ${install_url}" + curl -sLo "${deb_file}" "${install_url}" || + echo "(!) Version ${version} for ${UBUNTU_CODENAME} ${architecture} is not found" && exit 1 else - curl -sLo "${deb_file}" "https://download2.rstudio.org/server/${UBUNTU_CODENAME}/${architecture}/rstudio-server-${RS_VERSION/"+"/"-"}-${architecture}.deb" || - curl -sLo "${deb_file}" "https://s3.amazonaws.com/rstudio-ide-build/server/${UBUNTU_CODENAME}/${architecture}/rstudio-server-${RS_VERSION/"+"/"-"}-${architecture}.deb" || + install_url="https://download2.rstudio.org/server/${UBUNTU_CODENAME}/${architecture}/rstudio-server-${RS_VERSION/"+"/"-"}-${architecture}.deb" && + echo "Download from ${install_url}" && + curl -sLo "${deb_file}" "${install_url}" || + install_url="https://s3.amazonaws.com/rstudio-ide-build/server/${UBUNTU_CODENAME}/${architecture}/rstudio-server-${RS_VERSION/"+"/"-"}-${architecture}.deb" && + echo "Download failed, try from ${install_url}" && + curl -sLo "${deb_file}" "${install_url}" || echo "(!) Version ${RS_VERSION} for ${UBUNTU_CODENAME} ${architecture} is not found" && exit 1 fi