diff --git a/functions/additional.function b/functions/additional.function index a32a2b3..cef8e61 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -82,31 +82,16 @@ PAT-MENU() { fi cd ${HOME} git clone https://github.com/km4ack/patmenu2.git ${HOME}/patmenu2 - ##################################### - # Pat 12 Temp Workaround - ##################################### - #This will move the user to the "version12" branch of the Pat Menu code - #until this can be implemented into the main branch of code. This will - #allow Pat Menu to support both the new version of Pat as well as older - #versions. This section of code needs to be removed once the "version12" - #branch is merged with the master branch - PAT_VERSION=$(pat version | awk '{print $2}' | sed 's/v0.//;s/.0//') - - if [ "$PAT_VERSION" -le 11 ]; then - echo "pat version 11 detected" - else - echo "pat version 12 or greater detected" - echo "moving pat menu to the version12 branch" + #Verify that pat is on master branch. Pat can remain on an old branch + #due to a workaround when moving to Pat version 12. This caused Pat Menu + #to constantly report that it needed an update with the BAP update tool. + PAT_VER=$(grep release $HOME/patmenu2/changelog | head -1 | sed 's/release=//;s/\.//g') + if [ "$PAT_VER" -lt 260 ]; then cd $HOME/patmenu2 - git pull - git checkout version12 + git checkout master fi - ##################################### - # END Pat 12 Temp Workaround - ##################################### - bash ${HOME}/patmenu2/setup sed -i "s/N0CALL/${CALL}/" ${HOME}/patmenu2/config sed -i 's/1,0/3,0/g' ${HOME}/patmenu2/config