diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 555873c..e43c520 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -3859,9 +3859,7 @@ machine. It is recommended to use on a dedicated machine with a fresh install of Linux Mint 22.1 \ with the Cinammon desktop environment. -It is currently designed and tested mostly for Linux Mint 21.3, and Linux Mint 22. - -Future updates will only be made for Mint 22.1 support. +Updates and compatibility are only being made for Mint 22.1 at this time. If you previously installed FLDIGI on this machine using a package \ manager, please quit the installer, remove FLDIGI, and restart the program. @@ -3869,11 +3867,7 @@ manager, please quit the installer, remove FLDIGI, and restart the program. This program is designed to build FLDIGI from source to ensure you have the newest version \ possible. -Super User (sudo) priveledges are required to perform the apt-get \ -commands. - -You will be asked for your password in the terminal to perform some \ -tasks but you should not run the entire program as Root. " | yad \ + " | yad \ --image=$DIR/images/corps-icon.png \ --text-info \ --wrap \ @@ -3884,112 +3878,7 @@ ${r} ${c} || } -function notify_sources_menu() { -echo "You will need to ensure Source Code Repositories are enabled prior to \ -attempting builds of HAMLIB or the FLDIGI Suite of programs. -Select 'Enable Source Code' for the installer to assist you. - -Select 'Already Enabled' if you have previously completed this step." | yad \ ---image=$DIR/images/corps-icon.png \ ---center \ ---text-info \ ---wrap \ ---button="Quit:1" \ ---button="Already Enabled:0" \ ---button="Enable Source Code:2" \ ---title "Welcome to the AmRRON Installer / Updater." \ -${r} ${c} -rc=$? - -if [[ $rc == 1 ]]; then -{ yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } - -elif [[ $rc == 2 ]]; then -{ enable_source_repositories; return; } - -elif [[ $rc == 0 ]]; then -yad --center \ ---image=$DIR/images/corps-icon.png \ ---title "Source Repositories previously enabled" \ ---text "You have confirmed you have enabled source repositories on your system." ${r} ${c} || -{ yad --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } -fi -} - - - - -function enable_source_repositories() { - -if [[ $(uname -m) = aarch64 ]]; then - if [[ ${OSCN} = "stretch" ]]; then -sudo echo 'deb-src http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi' | \ -sudo tee -a /etc/apt/sources.list && sudo apt-get -y update && \ -yad \ ---image=$DIR/images/corps-icon.png \ ---center --button="gtk-ok:0" \ ---title "Source Code Repositories Enabled" \ ---text "Successfully enabled source code repositories" ${r} ${c} - - elif [[ ${OSCN} = "buster" ]]; then - -sudo echo 'deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi' | \ -sudo tee -a /etc/apt/sources.list && sudo apt-get -y update && \ -yad \ ---image=$DIR/images/corps-icon.png \ ---center --button="gtk-ok:0" \ ---title "Source Code Repositories Enabled" \ ---text "Successfully enabled source code repositories" ${r} ${c} - - fi -elif [[ ${PLAT} = "Ubuntu" ]]; then - -software-properties-gtk - -elif [[ ${PLAT} = "LinuxMint" ]]; then - -software-sources - -else - -yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Not a Supported OS" --text "Please manually enable software sources before continuing." ${r} ${c} -exit 1 -fi - -rc=$? - -if [[ $rc -eq 0 ]]; then -{ notify_sources_menu; return; } - -elif [[ $rc -eq 1 ]]; then -if [[ $(uname -m) = aarch64 ]]; then -echo "This installer failed to modify your /etc/apt/sources.list/n/nPlease manually \ -uncomment the deb-src line by removing the leading # before running this installer" | yad --center \ ---image=$DIR/images/corps-icon.png \ ---text-info \ ---wrap \ ---button="gtk-ok:0" \ ---title "Software Sources Modification Failed" \ -${r} ${c} -exit 1 - -else -echo "This installer failed to open your Sofware Sources menu.\n\nYou can do this \ -by pressing the Super-Key (Windows Key) and searching for 'Software Sources' in Mint or \ -'Software and Updates,' in Ubuntu.\n\nCheck to ensure Source Code is enabled prior to \ -running this installer." | yad --center \ ---image=$DIR/images/corps-icon.png \ ---text-info \ ---wrap \ ---button="gtk-ok:0" \ ---title "Software Sources Modification Failed" \ - ${r} ${c} -{ notify_sources_menu; return; } -fi - -fi -} ################################################################################ ################### Perform system updates to begin ########################## @@ -4877,7 +4766,6 @@ check_installed_programs query_updates add_dialout primer_menu -#notify_sources_menu system_update_menu swap_size_check main_menu