diff --git a/install.sh b/install.sh index b915d67..13bf43a 100755 --- a/install.sh +++ b/install.sh @@ -1,14 +1,3 @@ -welcome(){ - echo " This script will install if not installed: python-pip and python module paho-mqtt," - echo " configure Raspberry Pi MQTT monitor and create a cronjob to run it." - read -r -p " Do you want to proceed? [y/N] " response - if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then - printf "" - else - exit - fi -} - find_python(){ if [[ $(python3 --version) ]]; then python=$(which python3) @@ -215,8 +204,6 @@ create_shortcut(){ } main(){ - printm "Raspberry Pi MQTT Monitor installer" - welcome find_python check_and_install_pip create_venv diff --git a/remote_install.sh b/remote_install.sh index 42d2f10..8166070 100755 --- a/remote_install.sh +++ b/remote_install.sh @@ -8,7 +8,20 @@ printm(){ printf -- '-%.0s' $(seq $length); echo "" } +welcome(){ + printm "Raspberry Pi MQTT Monitor installer" + echo "Welcome to the Raspberry Pi MQTT Monitor installer." + echo "This script will install necessary components, configure the monitor and set up a cron job or service." + read -r -p "Ready to proceed? [y/N] " response + if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then + printf "" + else + exit + fi +} + main(){ + welcome if [[ $(git --version) ]]; then git=$(which git) else