diff --git a/_nmsg b/_nmsg new file mode 100755 index 0000000..dd1385a --- /dev/null +++ b/_nmsg @@ -0,0 +1,82 @@ +#!/bin/sh +echo $0 + +# if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ] +# then +# BASE=/static +# fi + +# if [ -d /zTools/zPrivateConfig ] && [ ! -d /static ] +# then +# BASE=/zTools/zPrivateConfig +# fi + +# if [ -d /zTools/zShared ] +# then +# BASE=/zTools/zShared +# fi + +if [ -d /static ] && [ ! -d /zTools ] +then + BASE=/static +fi + +if [ ! -d /static ] && [ -d /zTools/zPrivateConfig ] +then + BASE=/zTools/zPrivateConfig +fi + +# if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] +# then +# BASE=/static +# echo "BASE=${BASE}" +# fi + +# if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] +# then +# BASE=/zTools/zShared +# echo "BASE=${BASE}" +# fi + +# if [ ! -d /static ] && [ ! -d /zTools/zShared ] && [ -d /zTools/zPrivateConfig ] +# then +# BASE=/zTools/zPrivateConfig +# echo "BASE=${BASE}" +# fi + +MYNAME=$(uname -n) +if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zPrivateConfig ] +then + BASE=/volume12/zTools/Sync${MYNAME}/zTools/zPrivateConfig +fi + +echo "BASE=${BASE}" +if [ -f ${BASE}/secrets/.${MYNAME} ] +then + . ${BASE}/secrets/.${MYNAME} +else + if [ -f ${BASE}/secrets/.ntfyenv ] + then + . ${BASE}/secrets/.ntfyenv + else + if [ -z ${DUFUS+x} ] + then + mkdir -p ${BASE}/secrets + echo "Creat ${BASE}/secrets/.ntfyenv" + echo "Please update contents and rerun" + exit 1 + fi + fi +fi + +SCRIPT=$1 +MSG=$2 +MYNAME=`uname -n` + +SUBJECT=" ${MYNAME} - ${SCRIPT}: " + + + +curl \ + -d "${SUBJECT} ${MSG}" \ + ntfy.sh/${DUFUS} diff --git a/shared/_nfile b/shared/_nfile index ea3be5d..8e3865a 100755 --- a/shared/_nfile +++ b/shared/_nfile @@ -37,6 +37,11 @@ then BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared fi +echo "BASE=${BASE}" +if [ -f ${BASE}/secrets/.${MYNAME} ] +then + . ${BASE}/secrets/.${MYNAME} +else if [ -f ${BASE}/secrets/.ntfyenv ] then . ${BASE}/secrets/.ntfyenv @@ -44,14 +49,10 @@ else if [ -z ${DUFUS+x} ] then mkdir -p ${BASE}/secrets - echo "Created ${BASE}/secrets/.ntfyenv" + echo "Creat ${BASE}/secrets/.ntfyenv" echo "Please update contents and rerun" - echo "DUFUS="" " > ${BASE}/secrets/.ntfyenv - echo "TCHATID="" " >> ${BASE}/secrets/.ntfyenv exit 1 - else - mkdir -p ${BASE}/secrets - echo "DUFUS=${DUFUS}" > ${BASE}/secrets/.ntfyenv + fi fi fi