diff --git a/edit_pat_aliases.sh b/edit_pat_aliases.sh index 1555846..22ed2b3 100755 --- a/edit_pat_aliases.sh +++ b/edit_pat_aliases.sh @@ -18,7 +18,7 @@ #% #================================================================ #- IMPLEMENTATION -#- version ${SCRIPT_NAME} 1.4.3 +#- version ${SCRIPT_NAME} 1.4.4 #- author Steve Magnuson, AG7GN #- license CC-BY-SA Creative Commons License #- script_id 0 @@ -27,6 +27,7 @@ # HISTORY # 20200507 : Steve Magnuson : Script creation. # 20200718 : Steve Magnuson : Allow pactor, winmor, ardop aliases +# 20211129 : Steve Magnuson : Change location of pat configuration # #================================================================ # DEBUG OPTION @@ -175,7 +176,8 @@ SCRIPT_HEADSIZE=$(grep -sn "^# END_OF_HEADER" ${0} | head -1 | cut -f1 -d:) VERSION="$(ScriptInfo version | grep version | tr -s ' ' | cut -d' ' -f 4)" TITLE="Find RMS Stations $VERSION" -PAT_CONFIG="$HOME/.wl2k/config.json" +PAT_VERSION="$(pat version | cut -d' ' -f2)" +[[ $PAT_VERSION =~ v0.1[01]. ]] && PAT_CONFIG="$HOME/.wl2k/config.json" || PAT_CONFIG="$HOME/.config/pat/config.json" export PAT_CONFIG=$PAT_CONFIG export find_cmd='@bash -c "runFind %1 %2 %3 %4"' export view_remove_cmd='bash -c "viewDeleteAliases"' diff --git a/rigctl_gui.sh b/rigctl_gui.sh index 966613c..fb4009d 100755 --- a/rigctl_gui.sh +++ b/rigctl_gui.sh @@ -14,7 +14,7 @@ #% #================================================================ #- IMPLEMENTATION -#- version ${SCRIPT_NAME} 1.0.4 +#- version ${SCRIPT_NAME} 1.0.5 #- author Steve Magnuson, AG7GN #- license CC-BY-SA Creative Commons License #- script_id 0 @@ -23,6 +23,8 @@ # HISTORY # 20200609 : Steve Magnuson : Script creation. # 20200718 : Steve Magnuson : Delete unused function. +# 20211129 : Steve Magnuson : Updated to suppor new locations +# for pat confuguration # #================================================================ # DEBUG OPTION @@ -206,7 +208,8 @@ TITLE="Hamlib Rig Control (rigctld) Configuration $VERSION" CONFIG_FILE="$HOME/rigctld.conf" MESSAGE="Hamlib rigctld Configuration" -PAT_CONFIG="$HOME/.wl2k/config.json" +PAT_VERSION="$(pat version | cut -d' ' -f2)" +[[ $PAT_VERSION =~ v0.1[01]. ]] && PAT_CONFIG="$HOME/.wl2k/config.json" || PAT_CONFIG="$HOME/.config/pat/config.json" export PAT_CONFIG=$PAT_CONFIG export find_cmd='@bash -c "runFind "%1""' export view_remove_cmd='bash -c "viewDeleteAliases"'