diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 16aafe2..df11e1a 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -578,13 +578,9 @@ if [[ -d $USERDIR/hamlib-$NEWHAMLIB ]]; then echo "Hamlib $NEWHAMLIB already present" else -sudo apt-get install -y g++ make libxft-dev libusb-1.0-0-dev portaudio19-dev || +sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libltdl-dev libusb-1.0-0 libhamlib-utils libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-1.2-dev libpopt-dev tcl8.5-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev || { ERRCODE="Failed to build dependencies for Hamlib"; errors; return; } -sudo apt-get build-dep -y fldigi || -{ ERRCODE="Failed to build dependencies for Hamlib. This is likely due to \ -Source Code repositories not being enabled. Please check and rerun the program"; errors; return; } - cd $USERDIR && wget -N https://sourceforge.net/projects/hamlib/files/hamlib/${NEWHAMLIB}/hamlib-${NEWHAMLIB}.tar.gz || { ERRCODE="Failed to download Hamlib $NEWHAMLIB"; errors; return; } @@ -613,9 +609,8 @@ fi else echo "Installing / Updating FLDIGI version ${NEWFLDIGI}" - sudo apt-get install -y portaudio19-dev libusb-1.0-0-dev && sudo apt-get -y build-dep fldigi || - { ERRCODE="Failed to build dependencies for FLDIGI. This is likely due to \ -Source Code repositories not being enabled. Please check and rerun the program"; errors; return; } + sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libltdl-dev libusb-1.0-0 libhamlib-utils libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-1.2-dev libpopt-dev tcl8.5-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-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 || @@ -3727,7 +3722,7 @@ set_screen_size check_installed_programs query_updates primer_menu -notify_sources_menu +#notify_sources_menu system_update_menu swap_size_check main_menu