diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index e76cd52..068bbd9 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -614,8 +614,7 @@ fi else echo "Installing / Updating FLDIGI version ${NEWFLDIGI}" # sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libudev-dev libltdl-dev libusb-1.0-0 libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-2.0-dev libpopt-dev tcl8.6-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev || - sudo apt-get install -y libfltk1.3-dev libjpeg9-dev libxft-dev libxinerama-dev libxcursor-dev libsndfile1-dev libsamplerate0-dev portaudio19-dev libpulse-dev libusb-1.0-0-dev texinfo libudev-dev - { ERRCODE="Failed to get dependencies for FLDIGI."; errors; return; } + sudo apt-get install -y libfltk1.3-dev libjpeg9-dev libxft-dev libxinerama-dev libxcursor-dev libsndfile1-dev libsamplerate0-dev portaudio19-dev libpulse-dev libusb-1.0-0-dev texinfo libudev-dev || { ERRCODE="Failed to get dependencies for FLDIGI."; errors; return; } cd $USERDIR && wget -N https://sourceforge.net/projects/fldigi\ /files/fldigi/fldigi-${NEWFLDIGI}.tar.gz || @@ -1193,28 +1192,44 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then else - echo "Installing / Updating CHIRP to version ${NEWCHIRP}" + echo "Installing / Updating CHIRP to version ${NEWCHIRP}" sleep 2 if [[ ${CHIRP} == "NOT INSTALLED" ]]; then - sudo apt-get install -y python-gtk2 python-serial python-libxml2 python-future || - { ERRCODE="Failed to get dependencies for CHIRP"; errors; return; } + #sudo apt-get install -y python-gtk2 python-serial python-libxml2 python-future || + sudo apt-get install -y snapd || + { ERRCODE="Failed to install Snap for Chirp installation"; errors; return; } +# { ERRCODE="Failed to get dependencies for CHIRP"; errors; return; } fi - cd $USERDIR && wget -N https://trac.chirp.danplanet.com/\ -chirp_daily/LATEST/chirp-daily-${NEWCHIRP}.tar.gz || - { ERRCODE="Failed to download CHIRP"; errors; return; } - tar xzvf chirp-daily-${NEWCHIRP}.tar.gz && rm chirp-daily-\ -${NEWCHIRP}.tar.gz || - { ERRCODE="Failed to extract CHIRP"; errors; return; } + sudo snap install chirp-snap --edge || + { ERRCODE="Failed to install Chirp from snap store."; errors; return; } + sudo snap connect chirp-snap:raw-usb || + { ERRCODE="Failed to set USB permissions for Chirp-snap."; errors; return; } - cd $USERDIR/chirp-daily-${NEWCHIRP} || - { ERRCODE="Failed to enter CHIRP directory"; errors; return; } - sudo python setup.py install || - { ERRCODE="Failed to install CHIRP"; errors; return; } + + + + + +# cd $USERDIR && wget -N https://trac.chirp.danplanet.com/\ +#chirp_daily/LATEST/chirp-daily-${NEWCHIRP}.tar.gz || +# { ERRCODE="Failed to download CHIRP"; errors; return; } +# tar xzvf chirp-daily-${NEWCHIRP}.tar.gz && rm chirp-daily-\ +#${NEWCHIRP}.tar.gz || +# { ERRCODE="Failed to extract CHIRP"; errors; return; } + +# cd $USERDIR/chirp-daily-${NEWCHIRP} || +# { ERRCODE="Failed to enter CHIRP directory"; errors; return; } + +# sudo python setup.py install || +# { ERRCODE="Failed to install CHIRP"; errors; return; } fi - sudo usermod -aG dialout $USER || - { ERRCODE="Failed to add $USER to dialout group"; errors; return; } +# sudo usermod -aG dialout $USER || +# { ERRCODE="Failed to add $USER to dialout group"; errors; return; } + + + } diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index dd37d03..d19b0e9 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -4,6 +4,8 @@ - Changed piardopc to pull from archived working version - Changed hamlib deps to only libusb - updated fldigi deps + - modified more deps, fixed error reporting issue. + - Changed Chirp Install to be from snap. # Version 0.6.9 - Corrected wsjt-x address from http to https