From 644dbbf0d025b0645ea28d62c0fc4998edbfb3b2 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 22 Jul 2021 16:58:11 +0300 Subject: [PATCH] fix: do not assume basic tools on linux when intalling channels Fixes #7785 --- bin/reinstall_chrome_beta_linux.sh | 4 ++++ bin/reinstall_chrome_stable_linux.sh | 3 +++ bin/reinstall_msedge_beta_linux.sh | 4 ++++ bin/reinstall_msedge_dev_linux.sh | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/bin/reinstall_chrome_beta_linux.sh b/bin/reinstall_chrome_beta_linux.sh index afb9d87b56692..0d7db06315205 100755 --- a/bin/reinstall_chrome_beta_linux.sh +++ b/bin/reinstall_chrome_beta_linux.sh @@ -14,6 +14,10 @@ if dpkg --get-selections | grep -q "^google-chrome-beta[[:space:]]*install$" >/d $maybesudo apt-get remove -y google-chrome-beta fi +if ! command -v wget >/dev/null; then + $maybesudo apt-get install -y wget +fi + # 2. download chrome beta from dl.google.com and install it. cd /tmp wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb diff --git a/bin/reinstall_chrome_stable_linux.sh b/bin/reinstall_chrome_stable_linux.sh index c5078f6403543..6789a062b1665 100755 --- a/bin/reinstall_chrome_stable_linux.sh +++ b/bin/reinstall_chrome_stable_linux.sh @@ -15,6 +15,9 @@ if dpkg --get-selections | grep -q "^google-chrome[[:space:]]*install$" >/dev/nu $maybesudo apt-get remove -y google-chrome fi +if ! command -v wget >/dev/null; then + $maybesudo apt-get install -y wget +fi # 2. download chrome stable from dl.google.com and install it. cd /tmp diff --git a/bin/reinstall_msedge_beta_linux.sh b/bin/reinstall_msedge_beta_linux.sh index dab12e346f15a..a112158cfab91 100755 --- a/bin/reinstall_msedge_beta_linux.sh +++ b/bin/reinstall_msedge_beta_linux.sh @@ -14,6 +14,10 @@ if dpkg --get-selections | grep -q "^microsoft-edge-beta[[:space:]]*install$" >/ $maybesudo apt-get remove -y microsoft-edge-beta fi +if ! command -v curl >/dev/null; then + $maybesudo apt-get install -y curl +fi + curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/microsoft.gpg $maybesudo install -o root -g root -m 644 /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ $maybesudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list' diff --git a/bin/reinstall_msedge_dev_linux.sh b/bin/reinstall_msedge_dev_linux.sh index d5d292e805474..5cdbf9c41bed7 100755 --- a/bin/reinstall_msedge_dev_linux.sh +++ b/bin/reinstall_msedge_dev_linux.sh @@ -14,6 +14,10 @@ if dpkg --get-selections | grep -q "^microsoft-edge-dev[[:space:]]*install$" >/d $maybesudo apt-get remove -y microsoft-edge-dev fi +if ! command -v curl >/dev/null; then + $maybesudo apt-get install -y curl +fi + curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/microsoft.gpg $maybesudo install -o root -g root -m 644 /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ $maybesudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list'