diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 40181db..77040af 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1425,6 +1425,7 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then else + if [ $PLAT = Linuxmint ]; then echo "Installing / Updating CHIRP to version ${NEWCHIRP}" sleep 2 if ! hash flatpak 2>/dev/null; then @@ -1438,7 +1439,17 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then sudo flatpak install chirp-daily-$NEWCHIRP.flatpak || { ERRCODE="Failed to install chirp flatpak."; errors; return; } fi + 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 } function wsjtx_install() { @@ -2560,7 +2571,7 @@ sudo apt-get install -y snapd && sudo snap install core && sudo snap install kee } function keepassxc_install() { - + if [ $PLAT = Linuxmint ]; then if ! hash flatpak 2>/dev/null; then sudo apt-get install -y flatpak || { ERRCODE="Failed to install flatpak."; errors; return; } @@ -2571,9 +2582,12 @@ function keepassxc_install() { sudo flatpak install flathub org.keepassxc.KeePassXC || { ERRCODE="Failed to install keepassxc flatpak."; errors; return; } -#flatpak install flathub org.keepassxc.KeePassXC - + else + +sudo apt-get install -y snapd && sudo snap install core && sudo snap install keepassxc || +{ ERRCODE="Failed to install snap / snap core requirements for KeepassXC"; errors; return; } + fi } function iceweasel_install() { diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index fc20a0d..955f3e3 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -3,7 +3,7 @@ - Removed auto removal of source directories. - Added VARIM to install - Tweaked dialout add function -- Switched Chirp and Keepassxc to flatpak install due to snap failures +- Switched Chirp and Keepassxc to flatpak install due to snap failures on Mint / snap installation on raspberry pi # Version 0.7.4.2 - Pulling ardopc from gitlab folder due to website release version issues.