diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 89e5707..98a6c2e 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -843,7 +843,7 @@ fi -function ardop_install() { +function ardop_install_old() { ARDOPDIR=$USERDIR/ARDOP @@ -905,6 +905,64 @@ function ardop_install() { } +function ardop_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 + + 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/ardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || + { ERRCODE="Failed to download ardop"; 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_gui_install() { ARDOPDIR=$USERDIR/ARDOP diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 84b5d4f..6fb8721 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,6 @@ +# Version 0.7.4.2 +- Pulling ardopc from gitlab folder due to website release version issues. + # Version 0.7.4.1 - changed ardopc download to ardopc64 and rename to ardopc for ease of integration. - fixed change to make ardop executable