From 2a3c5d157c9d5fab7d56e581fd0593e85793e7af Mon Sep 17 00:00:00 2001 From: RecursiveFuctions Date: Sun, 24 Dec 2023 00:58:12 -0800 Subject: [PATCH 1/2] Bug fix: #290 run apt only on required packages --- setup.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/setup.sh b/setup.sh index ce8fc2b5..d807dff7 100755 --- a/setup.sh +++ b/setup.sh @@ -8,16 +8,9 @@ if [ $REPLY = "y" ] if [[ $(cat /etc/os-release | grep -i debian) != "" ]]; then echo "Client is a Debian-based system. Installing binaries"; - echo - echo "*** RUNNING APT-GET UPDATE ***" - sudo apt-get update --allow-releaseinfo-change - if [ $? -ne 0 ]; then echo "ERROR: 'apt-get update' failed with error code: $?"; exit 1; fi - echo echo "*** INSTALLING REQUIRED BINARIES ***" - sudo apt-get install ffmpeg -y - sudo apt-get install chromium-browser -y - sudo apt-get install chromium-chromedriver -y + sudo apt install --only-upgrade ffmpeg chromium-browser chromium-chromedriver -y if [ $? -ne 0 ]; then echo "ERROR: Binary dependency installation failed with error code: $?"; exit 1; fi else echo "Client is not Debian-based. Skipping binary installation. Please install ffmpeg and chrome manually."; From f8e25ceed8af53384311e378206739e542524865 Mon Sep 17 00:00:00 2001 From: RecursiveFuctions Date: Sun, 24 Dec 2023 11:58:44 -0800 Subject: [PATCH 2/2] better fix for #290 that still upgrades packages. Error condition will output to console, but script will continue to install dependencies. --- setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.sh b/setup.sh index d807dff7..6f6f6334 100755 --- a/setup.sh +++ b/setup.sh @@ -9,6 +9,9 @@ if [ $REPLY = "y" ] if [[ $(cat /etc/os-release | grep -i debian) != "" ]]; then echo "Client is a Debian-based system. Installing binaries"; echo + echo "*** RUNNING APT-GET UPDATE ***" + sudo apt update --allow-releaseinfo-change || true + if [ $? -ne 0 ]; then echo "ERROR: 'apt-get update' failed with error code: $?"; fi echo "*** INSTALLING REQUIRED BINARIES ***" sudo apt install --only-upgrade ffmpeg chromium-browser chromium-chromedriver -y if [ $? -ne 0 ]; then echo "ERROR: Binary dependency installation failed with error code: $?"; exit 1; fi