diff options
| -rwxr-xr-x | sfeed_update | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sfeed_update b/sfeed_update index 58d25fc..56be43a 100755 --- a/sfeed_update +++ b/sfeed_update @@ -63,19 +63,18 @@ convertencoding() { # fetch and parse feed. # feed(name, feedurl, [basesiteurl], [encoding]) feed() { - (tmpfeedfile=$(mktemp -p "${sfeedtmpdir}") - name="$1" + (name="$1" + tmpfeedfile="${sfeedtmpdir}/${name}" tmpencfile="" encoding="$4" sfeedfile="${sfeeddir}/$1" if [ ! "${encoding}" = "" ]; then fetchfeed "$2" "$1" "${sfeedfile}" | convertencoding "${encoding}" "utf-8" else # detect encoding. - tmpencfile=$(mktemp -p "${sfeedtmpdir}") + tmpencfile="${tmpfeedfile}.enc" fetchfeed "$2" "$1" "${sfeedfile}" > "${tmpencfile}" detectenc=$(sfeed_xmlenc < "${tmpencfile}") convertencoding "${detectenc}" "utf-8" < "${tmpencfile}" - rm -f "${tmpencfile}" fi | sfeed "$3" > "${tmpfeedfile}" # get new data and merge with old. |