diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index a7de0f8..379a090 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1156,6 +1156,9 @@ function voacap_install() { makeitshfbc || { ERRCODE="VOACAPL makeitshfbc failed"; errors; return; } + if [[ $OSCN =~ (eoan|focal) ]]; then + { echo voacap_os >> /tmp/cleanup; return; } + else sudo apt-get -y install yelp python3-gi python3-gi-cairo rarian-compat gnome-doc-utils \ pkg-config python3-dateutil python3-mpltoolkits.basemap python3-cairocffi libgtk-3-dev gettext || @@ -1171,7 +1174,7 @@ pkg-config python3-dateutil python3-mpltoolkits.basemap python3-cairocffi libgtk ./configure && sudo make install || { ERRCODE="Failed to compile VOACAPL pythonprop GUI"; errors; return; } - +fi } function chirp_install() { @@ -3633,6 +3636,14 @@ TEXT="JS8Call does not yet support Ubuntu 19.10." ;; +voacap_os) + +TITLE="VOACAPL pythonprop GUI Unsupported Operating System." +TEXT="VOACAPL pythonprop GUI does not yet support Ubuntu 19.10." + cleanupyad + + ;; + pybitmessagesetup) if [[ ${PLAT} = "Raspbian" ]]; then echo --text "Add @/usr/local/bin/pybitmessage to the file /etc/xdg/lxsession/LXDE-pi/autostart \