Skip to content

Commit 60fd8ef

Browse files
authored
Merge pull request #3 from rrobinett/pythonpipe
Suppress Python error messages "sys.excepthook is missing"
2 parents 9a08484 + 3a49b9e commit 60fd8ef

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

wsprdaemon.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,19 @@ shopt -s -o nounset ### bash stops with error if undeclared variable is
104104
### 6) added -Z, check for and offer to kill zombies and add it to -z
105105
#declare -r VERSION=2.5 ### Release to public, same as 2.4j
106106
#declare -r VERSION=2.5a ### Enhance checks for zombies. Add support for installation of WSJT-x on x86 machines
107-
declare -r VERSION=2.5b ### Extend wait time to 30 seconds during schedule changes, but still seeing WD listeners on wrong RX 0/1.
107+
#declare -r VERSION=2.5b ### Extend wait time to 30 seconds during schedule changes, but still seeing WD listeners on wrong RX 0/1.
108108
### Prompt user before installing new SW. Graphs now -165 to -115
109109
### Use /tmp/wsprdaemon/... and move all WD temp files there,
110110
### Verify that the best SNR from the MERGED_RX are
111111
### Added log output from two checks for GPS lock . Fix in Kiwi V1.335 seems to fix the 'permanent loss of GPS lock' problem
112112
### Added overload (OV) detection and reporting to watchdog.log at verbosity=1 and above
113113
### Added logging of WD listeners on RX0/1 channel when verbosity > 1
114+
declare -r VERSION=2.6a ### Extend wait time to 30 seconds during schedule changes, but still seeing WD listeners on wrong RX 0/1.
115+
### Fixed spurious sys.excepthook is missing error message
114116
### TODO: use Python library to obtain sunrise/sunset times rather than web site
115117
### TODO: fix dual USB audio input
116118
### TODO: add VHF/UHF support using Soapy API
119+
### TODO: enhance noise database logging and add wpsrdaemon spots database
117120

118121
lc_numeric=$(locale | sed -n '/LC_NUMERIC/s/.*="*\([^"]*\)"*/\1/p') ### There must be a better way, but locale sometimes embeds " in it output and this gets rid of them
119122
if [[ "${lc_numeric}" != "en_US.UTF-8" ]] && [[ "${lc_numeric}" != "en_GB.UTF-8" ]] && [[ "${lc_numeric}" != "C.UTF-8" ]] ; then
@@ -232,7 +235,7 @@ function check_for_kiwirecorder_cmd() {
232235
get_kiwirecorder="yes"
233236
else
234237
## Check to see if kwr supports overload reporting
235-
if ! ${KIWI_RECORD_COMMAND} --help | grep -q "ADC OV" ; then
238+
if ! ${KIWI_RECORD_COMMAND} --help | grep "ADC OV" > /dev/null 2>&1 ; then
236239
get_kiwirecorder="yes"
237240
echo "Currently installed version of kiwirecorder.py does not support overload reporting, so getting new version"
238241
rm -rf ${KIWI_RECORD_DIR}.old

0 commit comments

Comments
 (0)