From c14cda03d6e6d45f5f3fe99e52ef00cffb1fdf33 Mon Sep 17 00:00:00 2001 From: tb14 Date: Sat, 5 Nov 2022 17:38:24 -0500 Subject: [PATCH] extra fi --- AmRRON-Setup-Script.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 77040af..895afff 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1428,26 +1428,31 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then if [ $PLAT = Linuxmint ]; then echo "Installing / Updating CHIRP to version ${NEWCHIRP}" sleep 2 - if ! hash flatpak 2>/dev/null; then - sudo apt-get install -y flatpak || - { ERRCODE="Failed to install flatpak."; errors; return; } - fi + if ! hash flatpak 2>/dev/null; then + sudo apt-get install -y flatpak || + { ERRCODE="Failed to install flatpak."; errors; return; } + fi + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo || { ERRCODE="Failed to add flathub remote."; errors; return; } + cd $USERDIR && wget -N https://trac.chirp.danplanet.com/chirp_daily/LATEST/chirp-daily-$NEWCHIRP.flatpak || { ERRCODE="Failed to download new version of chirp."; errors; return; } + sudo flatpak install chirp-daily-$NEWCHIRP.flatpak || { ERRCODE="Failed to install chirp flatpak."; errors; return; } - fi - else + + else + sudo apt-get install -y snapd || { ERRCODE="Failed to install Snap for Chirp installation"; 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; } - fi + fi fi }