From 215150d8551ec45c4d018de02f75a0007895d887 Mon Sep 17 00:00:00 2001 From: tb14 Date: Sat, 18 Jan 2025 10:17:19 -0600 Subject: [PATCH] Ardopcf and ardopgui fixes --- AmRRON-Setup-Script.sh | 149 +++++++++++++++------------ changelogs/CHANGELOG-Setup-Script.md | 2 + 2 files changed, 84 insertions(+), 67 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 01c3147..655a645 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.9.5 ######################## +######################## AmRRON Setup Script v0.9.6 ######################## ######################## Created by TB-14 ######################## ######################## 18 JAN 2025 ######################## ################################################################################ @@ -1053,69 +1053,6 @@ fi - -function ardop_install_old() { - - ARDOPDIR=$USERDIR/ARDOP - - if [[ $(uname -m) =~ (armv7l|aarch64) ]]; then - ARDOP=$"piardopc" - - if [[ -f $ARDOPDIR/$ARDOP ]]; then - echo "Making backup of current version" - mv $ARDOPDIR/$ARDOP $ARDOPDIR/${ARDOP}-$(date +%h%d).bak || - { ERRCODE="Failed to create backup of current ardop file"; errors; return; } - fi - - echo "Copying archived working $ARDOP version from "$DIR"/Files/piardopc." - #wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ -#wiseman/Downloads/Beta/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || - mkdir -p $ARDOPDIR && cp $DIR/Files/piardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || - { ERRCODE="Failed to download ardop"; errors; return; } - - - else - ARDOP=$"ardopc" - - - if [[ -f $ARDOPDIR/$ARDOP ]]; then - echo "Making backup of current version" - mv $ARDOPDIR/$ARDOP $ARDOPDIR/${ARDOP}-$(date +%h%d).bak || - { ERRCODE="Failed to create backup of current ardop file"; errors; return; } - else - mkdir -p $ARDOPDIR || - { ERRCODE="Failed to create ARDOPDIR"; errors; return; } - fi - - sudo apt-get -y install libasound2-dev || - { ERRCODE="Failed to get dependencies for ARDOPC"; errors; return; } - - echo "Downloading current $ARDOP version." - wget -P $ARDOPDIR -N http://www.cantab.net/users/john.wiseman/Downloads/Beta/ardopc64 && mv $ARDOPDIR/ardopc64 $ARDOPDIR/ardopc && chmod +x $ARDOPDIR/ardopc || - { ERRCODE="Failed to download ARDOPC"; errors; return; } - fi - - if [[ ! -f $HOME/.asoundrc ]]; then - echo "pcm.ARDOP { - type rate - slave { - pcm "\""hw:1,0"\"" - rate 48000 - } - }" > $HOME/.asoundrc || - { ERRCODE="Failed to create .asoundrc configuration file"; errors; return; } - fi - echo ardop >> /tmp/cleanup - echo asoundrc >> /tmp/cleanup - - if ! hash ardop-status 2>/dev/null; then - ardop_launcher - fi - - - } - - function ardop_install() { ARDOPDIR=$USERDIR/ARDOP @@ -1173,6 +1110,67 @@ function ardop_install() { } +function ardopcf_install() { + + ARDOPDIR=$USERDIR/ARDOP + + if [[ $(uname -m) =~ (armv7l|aarch64) ]]; then + ARDOP=$"piardopc" + + if [[ -f $ARDOPDIR/$ARDOP ]]; then + echo "Making backup of current version" + mv $ARDOPDIR/$ARDOP $ARDOPDIR/${ARDOP}-$(date +%h%d).bak || + { ERRCODE="Failed to create backup of current ardop file"; errors; return; } + fi + + echo "Copying archived working $ARDOP version from "$DIR"/Files/piardopc." + #wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ +#wiseman/Downloads/Beta/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || + mkdir -p $ARDOPDIR && cp $DIR/Files/piardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || + { ERRCODE="Failed to download ardop"; errors; return; } + + + else + ARDOP=$"ardopc" + + + if [[ -f $ARDOPDIR/$ARDOP ]]; then + echo "Making backup of current version" + mv $ARDOPDIR/$ARDOP $ARDOPDIR/${ARDOP}-$(date +%h%d).bak || + { ERRCODE="Failed to create backup of current ardop file"; errors; return; } + fi + rm $ARDOPDIR/*.txt || + { ERRCODE="Failed to remove previous date marker file"; errors; return; } + mkdir -p $ARDOPDIR && mkdir $ARDOPDIR/build && cd $ARDOPDIR/build || + { ERRCODE="Failed to create ardopcf build directory"; errors; return; } + git clone https://github.com/pflarue/ardop.git || + { ERRCODE="Failed to clone ardopcf repo."; errors; return; } + cd $ARDOPDIR/build/ardop && make || + { ERRCODE="Failed to compile ardopcf"; errors; return; } + cp $ARDOPDIR/build/ardop/ardopcf $ARDOPDIR/ardopc || + { ERRCODE="Failed to copy ardopcf to the ARDOP Directory"; errors; return; } + rm -r $ARDOPDIR/build && touch $ARDOPDIR/$(date +"%Y%m%d") + fi + + if [[ ! -f $HOME/.asoundrc ]]; then + echo "pcm.ARDOP { + type rate + slave { + pcm "\""hw:1,0"\"" + rate 48000 + } + }" > $HOME/.asoundrc || + { ERRCODE="Failed to create .asoundrc configuration file"; errors; return; } + fi + echo ardopcf >> /tmp/cleanup + echo asoundrc >> /tmp/cleanup + + if ! hash ardop-status 2>/dev/null; then + ardop_launcher + fi + + + } function ardop_gui_install() { @@ -1208,7 +1206,7 @@ else #Debian 10 version #sudo apt-get -y install g++ qt5-default || #Debian 11 version - sudo apt-get -y install g++ qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools || + sudo apt-get -y install g++ qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5widgets5:i386 || { ERRCODE="Failed to get dependencies for ARDOP_GUI"; errors; return; } wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ @@ -3461,6 +3459,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "FLRIG" "FLRIG Radio Control Program" "${FLRIG}" "${NEWFLRIG}" \ false "FLWRAP" "FLWRAP Radio Control Program" "${FLWRAP}" "${NEWFLWRAP}" \ false "ARDOP" "Downloads the newest ARDOP v1 TNC" "Unknown" "${NEWARDOP}" \ + false "ARDOPCF" "Downloads the newest ARDOPCF TNC fork" "Unknown" "${NEWARDOP}" \ false "ARDOPGUI" "Downloads the newest ARDOP Graphical User Interface" "Unknown" "${NEWARDOPGUI}" \ false "ARIM" "Amateur Radio Instant Messanger" "${ARIM}" "${NEWARIM}" \ false "GARIM" "Graphical ARIM interface" "${GARIM}" "${NEWGARIM}" \ @@ -3479,7 +3478,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s rc=$? if [[ $rc == 2 ]]; then - radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMMSTATONE PULSE UBLOX FORMS) + radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMMSTATONE PULSE UBLOX FORMS) for i in "${radioArray[@]}" do @@ -4048,7 +4047,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY COMMSTATONE DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS) + easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY COMMSTATONE DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS) for i in "${easyArray[@]}" do @@ -4145,6 +4144,9 @@ cat /tmp/results | yad --text-info --center \ ARDOP) echo "Updating ARDOP" ardop_install ;; + ARDOPCF) echo "Updating ARDOPCF" + ardopcf_install + ;; ARDOPGUI) echo "Updating ARDOP_GUI" ardop_gui_install ;; @@ -4356,6 +4358,19 @@ communications at this time." ;; + ardopcf) + +TITLE="ARDOP Versions" +TEXT="This installer compiled the current fork of ardop from https://github.com/pflarue/ardop.git. + + You can run the setup script and choose ARDOPC for the old version if you have issues. + + Version checking is not currently supported from the script. Re-running the ARDOPCF selection \ + will pull the most current build." + cleanupyad + + ;; + asoundrc) TITLE="ARDOP configuration" diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 29b51f3..d1a3793 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 0.9.6 +- ardopcf install and ardopgui dependency fix # Version 0.9.5 - Fixing issues with Mint 22.1 support # Version 0.9.4