diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index a50f79d..2948dd3 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -449,7 +449,7 @@ fi echo "70% Complete" -NEWCHIRP=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ | \ +NEWCHIRP=$(curl -sL https://trac.chirp.danplanet.com/download\?stream\=next | \ grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8) if [[ $NEWCHIRP == "" ]]; then NEWCHIRP="SERVER DOWN" @@ -1440,7 +1440,8 @@ fi #} -function chirp_install() { + +function chirp_install_old2() { if [[ $NEWCHIRP == "SERVER DOWN" ]]; then echo "CHIRP server unresponsive or broken link." >> /tmp/failures return @@ -1487,6 +1488,30 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then fi } +function chirp_install() { +if [[ $NEWCHIRP == "SERVER DOWN" ]]; then + echo "CHIRP server unresponsive or broken link." >> /tmp/failures + return +fi + +if [[ ${CHIRP} == ${NEWCHIRP} ]]; then + echo "Chirp is already at the most current version" + + + else + cd $USERDIR && wget https://trac.chirp.danplanet.com/chirp_next/next-$NEWCHIRP/chirp-$NEWCHIRP.tar.gz || + { ERRCODE="Failed to download Chirp-Next"; errors; return; } + + tar -xvf chirp-$NEWCHIRP.tar.gz && cd chirp-$NEWCHIRP/ || + { ERRCODE="Failed to extract Chirp-Next"; errors; return; } + + sudo python3 setup.py install || + { ERRCODE="Failed to install Chirp-Next"; errors; return; } + fi + +} + + function wsjtx_install() { if [[ $NEWWSJTXVER == "SERVER DOWN" ]]; then @@ -1573,23 +1598,12 @@ function amrronforms_install() { function comstat_install() { -if [[ $OSCN =~ una|vanessa ]]; then +if [[ $OSCN =~ una|vanessa|vera ]]; then -cd $USERDIR && wget https://github.com/W5DMH/CommStatX/raw/main/commstatx.tar.gz || +cd $USERDIR && git clone https://github.com/W5DMH/commstatone.git || { ERRCODE="Failed to download comstat archive"; errors; return; } -tar -xzvf commstatx.tar.gz && rm comstatx.tar.gz|| -{ ERRCODE="Failed to extract comstat archive"; errors; return; } - -cd $USERDIR/comstatx || -{ ERRCODE="Failed to enter comstat directory"; errors; return; } - -python3 -m pip install --upgrade pip || -{ ERRCODE="Failed to perform python pip upgrade"; errors; return; } - -python3 install.py || -{ ERRCODE="Failed to install comstatx"; errors; return; } - +echo comstatone >> /tmp/cleanup else echo "Comstat install has not been tested on your distribution." @@ -4008,7 +4022,16 @@ ARDOP_GUI on a 64bit OS prior to Mint 19+ and Ubuntu 18.04+" cleanupyad ;; - ardoptools) + + comstatone) +TITLE="ComstatONE Downloaded" +TEXT="ComstatONE has been downloaded but requires manual installation for now. \ +Please navigate to your Radio directory and enter the commstatone directory. Type chmod +x linuxinstall.sh \ +to run after installation, type python commstat.py or python3 commstat.py" + cleanupyad + ;; + + ardoptools) TITLE="KM4ACK Find Ardop" TEXT="KM4ACK's script has been installed. The commands are getardoplist \