From 5ff26d06b99bdee2c142e8c396742fa0fd0776f4 Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 4 Jan 2024 12:27:19 +0100 Subject: [PATCH] patching --- RUNTIME/SECTOR.refresh.sh | 3 ++- tools/RSS2UPlanetTW.sh | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 430565ef..43a501e0 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -143,7 +143,8 @@ for SECTOR in ${SECTORS[@]}; do ## NEW TW TEMPLATE [[ ! -s ${INDEX} ]] \ - && sed "s~_SECTOR_~${SECTOR}~g" ${MY_PATH}/../templates/empty.html > ${INDEX} + && sed "s~_SECTOR_~${SECTOR}~g" ${MY_PATH}/../templates/empty.html > ${INDEX} \ + && echo "REFRESHING SECTOR FROM empty TEMPLATE *****" ## SET SECTOR sed -i "s~_SECTOR_~${SECTOR}~g" ${INDEX} diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh index 148b7d96..82509053 100755 --- a/tools/RSS2UPlanetTW.sh +++ b/tools/RSS2UPlanetTW.sh @@ -18,7 +18,10 @@ INDEX=$4 [[ ! -s ${RSS} ]] && echo "BAD RSS INPUT" && exit 1 [[ ! -d ~/.zen/tmp/${MOATS}/${SECTOR}/ ]] && echo "BAD UPLANET CONTEXT" && exit 1 -[[ ! -s ${INDEX} ]] && echo "BAD TW INDEX" && exit 1 +[[ ! -s ${INDEX} ]] \ + && sed "s~_SECTOR_~${SECTOR}~g" ${MY_PATH}/../templates/empty.html > ${INDEX} \ + && echo "REFRESHING SECTOR FROM empty TEMPLATE *****" + ## EXTRACT PLAYER FROM RSS FILE NAME PLAYER=$(echo ${RSS} | rev | cut -d '/' -f 1 | rev | sed "s~.rss.json~~g") @@ -45,7 +48,7 @@ while read title; do rm -f ~/.zen/tmp/${MOATS}/${SECTOR}/TMP.json tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS}/${SECTOR} --render '.' 'TMP.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${title}" ISHERE=$(cat ~/.zen/tmp/${MOATS}/TMP.json | jq -r ".[].title") - [[ "${ISHERE}" == "null" ]] && echo "No Tiddler found in ${INDEX}" + [[ ! "${ISHERE}" ]] && echo "No Tiddler found in ${INDEX}" if [[ "${ISHERE}" != "${title}" ]]; then