From df7b7892dede42415256de2ffafbd496e37b1f7f Mon Sep 17 00:00:00 2001 From: MastaG Date: Tue, 2 Jul 2024 13:08:56 +0200 Subject: [PATCH] More fixes for 24.10 --- .github/workflows/turnip.yml | 1 + turnip_builder.sh | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/turnip.yml b/.github/workflows/turnip.yml index 52aaabb..84b575e 100644 --- a/.github/workflows/turnip.yml +++ b/.github/workflows/turnip.yml @@ -17,6 +17,7 @@ jobs: sudo sed -i 's/^Types: deb$/Types: deb deb-src/g' /etc/apt/sources.list.d/*.sources sudo apt update sudo apt build-dep mesa -y + sudo apt install -y python3-mako meson - name: Execute build script run: bash ./turnip_builder.sh diff --git a/turnip_builder.sh b/turnip_builder.sh index 12fe1f1..0fe9969 100755 --- a/turnip_builder.sh +++ b/turnip_builder.sh @@ -42,22 +42,20 @@ run_all(){ check_deps(){ echo "Checking system for required Dependencies ..." for deps_chk in $deps; - do - sleep 0.25 - if command -v "$deps_chk" >/dev/null 2>&1 ; then - echo -e "$green - $deps_chk found $nocolor" - else - echo -e "$red - $deps_chk not found, can't countinue. $nocolor" - deps_missing=1 - fi; - done - - if [ "$deps_missing" == "1" ] - then echo "Please install missing dependencies" && exit 1 - fi + do + sleep 0.25 + if command -v "$deps_chk" >/dev/null 2>&1 ; then + echo -e "$green - $deps_chk found $nocolor" + else + echo -e "$red - $deps_chk not found, can't countinue. $nocolor" + deps_missing=1 + fi; + done + + if [ "$deps_missing" == "1" ] + then echo "Please install missing dependencies" && exit 1 + fi - echo "Installing python Mako dependency (if missing) ..." $'\n' - pip install mako &> /dev/null } prepare_workdir(){