diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index fb4659c..8d810c3 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -223,8 +223,8 @@ if hash pat 2>/dev/null; then PAT="NOT INSTALLED" fi -if hash chirpw 2>/dev/null; then - CHIRP=$(chirpw --version | awk -F 'daily-' '{print $2}' | head -c 8) +if hash chirp 2>/dev/null; then + CHIRP=$(chirp --version | awk -F 'next-' '{print $2}' | head -c 8) else if hash chirp-snap 2>/dev/null; then CHIRP=$(chirp-snap --version | awk -F 'daily-' '{print $2}' | head -c 8) @@ -1727,7 +1727,9 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then tar -xvf chirp-$NEWCHIRP.tar.gz && cd chirp-$NEWCHIRP/ || { ERRCODE="Failed to extract Chirp-Next"; errors; return; } - sudo apt install -y git python3-wxgtk4.0 python3-serial python3-six python3-future python3-requests python3-pip || + sudo apt install -y git python3-wxgtk4.0 python3-serial python3-six python3-future python3-requests python3-pip pipx3 python3-yattag || + + { ERRCODE="Failed to install python dependencies for Chirp-Next"; errors; return; } sudo python3 setup.py install ||