From b00466c5dd1d07a407171bc5273f5d644382c61c Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Wed, 11 Jun 2025 08:35:17 +0200 Subject: [PATCH] Fix script errors --- gui/home/home.kv | 2 +- install-linux.sh | 15 +++++++++------ launch.sh | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gui/home/home.kv b/gui/home/home.kv index df51bd5..a0afd18 100644 --- a/gui/home/home.kv +++ b/gui/home/home.kv @@ -32,7 +32,7 @@ on_release: root.quit() Label: - text: "You are running version V3.0.0" + text: "You are running version V3.0.1" font_size: 13 pos_hint: {"y": -0.45, "x":0.05} Button: diff --git a/install-linux.sh b/install-linux.sh index 476ede4..8e26ca3 100755 --- a/install-linux.sh +++ b/install-linux.sh @@ -31,17 +31,19 @@ use_venv="" read -p "Install dependencies in a virtual environment? (Y/n) " use_venv use_venv=$(echo "$use_venv" | tr '[:upper:]' '[:lower:]') -echo "\n => Checking for repo..." +echo " + => Checking for repo... +" if [[ -f ./biogascontrollerapp.py ]]; then - echo "\n -> Data found, not downloading" + echo " -> Data found, not downloading" else do_download="" read -p " -> Data not found, okay to download? (Y/n) " do_download do_download=$(echo "$do_download" | tr '[:upper:]' '[:lower:]') if [[ "$do_download" == "y" || "$do_download" == "" ]]; then # Check if wget is installed - if [[ !command -v wget >/dev/null 2>&1 ]]; then + if !command -v wget >/dev/null 2>&1; then echo "wget unavailable. Please install using your distribution's package manager or manually download the repo from GitHub releases" echo 1 fi @@ -53,9 +55,10 @@ else tar -xf ./biogascontrollerapp-linux.tar.gz # Remove tarball (to keep it clean) - rm ./biogascontrollerapp.tar.gz + rm ./biogascontrollerapp-linux.tar.gz + mv dist biogascontrollerapp-linux - cd biogascontrollerapp/ + cd biogascontrollerapp-linux/ else echo "Please download the repo manually and execute the script inside the downloaded repo from GitHub releases" exit 1 @@ -74,7 +77,7 @@ if [[ "$use_venv" == "y" || "$use_venv" == "" ]]; then source ./.venv/bin/activate fi - if [[ !command -v deactivate >/dev/null 2>&1 ]]; then + if !command -v deactivate >/dev/null 2>&1; then echo "Virtual environment could not be activated. You may install the dependencies by changing to the biogascontrollerapp directory and running pip install -r requirements.txt" diff --git a/launch.sh b/launch.sh index 6210a92..1c58df8 100755 --- a/launch.sh +++ b/launch.sh @@ -10,7 +10,7 @@ if [[ -f ./.venv/bin/activate ]]; then source ./.venv/bin/activate fi - if [[ !command -v deactivate >/dev/null 2>&1 ]]; then + if !command -v deactivate >/dev/null 2>&1; then echo "Virtual environment could not be activated. Trying to run anyway" fi fi