diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index a3c958f..741d3a6 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.9.0 ######################## +######################## AmRRON Setup Script v0.9.1 ######################## ######################## Created by TB-14 ######################## ######################## 13 JAN 2025 ######################## ################################################################################ @@ -1795,8 +1795,8 @@ if [[ $OSCN = wilma ]]; then cd ~/Radio/commstatone && sudo apt install -y python3.12-venv || { ERRCODE="Failed to install python3.12-venv virtual environment dependencies"; errors; return; } -#sed -i -e '110d' install.py || -#{ ERRCODE="Failed to remove Start Settings line from install.py IOT allow for automated install."; errors; return; } +sed -i -e '110d' install.py || +{ ERRCODE="Failed to remove Start Settings line from install.py IOT allow for automated install."; errors; return; } python3 -m venv venv || { ERRCODE="Failed to create python virtual environment"; errors; return; } @@ -1810,9 +1810,13 @@ pip3 install pyqt5 || pip3 install pyqtwebengine || { ERRCODE="Failed to download pyqtwebengine dependency"; errors; return; } +bash linuxinstall.sh || +{ ERRCODE="Failed to run linux install"; errors; return; } + deactivate || { ERRCODE="Failed to deactivate python virtual environment"; errors; return; } + fi