diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-10-13 21:06:08 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-10-13 21:07:20 -0400 |
| commit | 94621fcce588f8bd8b074cf9c47c36b3aacf70c7 (patch) | |
| tree | c598c7210da58f9547b46e7bd7a04caec03b13eb /src/usr/local/sbin | |
| parent | 36b0c8afc0b8452d2c1926ed7934e338f0cd97b3 (diff) | |
| download | pfsense-94621fcce588f8bd8b074cf9c47c36b3aacf70c7.zip pfsense-94621fcce588f8bd8b074cf9c47c36b3aacf70c7.tar.gz | |
pfSense-upgrade revised to kill tail on exit
pkg_mgr_install.php revised to catch json deocde error on partial lines read from file
Diffstat (limited to 'src/usr/local/sbin')
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 53696ae..3bc131f 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -650,9 +650,13 @@ if [ -n "${progress_fifo}" ]; then if [ -e "${progress_fifo}.json" ]; then rm -f ${progress_fifo}.json fi + # Read fifo and save content to a file in background # GUI will read progress from file - tail -f ${progress_fifo} > ${progress_fifo}.json & + # json file - logfile - ".txt" + ".json" + progress_file=${logfile%.*}.json + tail -f ${progress_fifo} > ${progress_file} & + tailpid=$! export EVENT_PIPE="${progress_fifo}" fi @@ -674,4 +678,6 @@ case "${action}" in _exit 1 esac +kill ${tailpid} + _exit 0 |
