From ed951ac684972a293cb49bd0fec64a4ecbb04149 Mon Sep 17 00:00:00 2001 From: spongle Date: Wed, 28 Sep 2022 20:06:57 +0100 Subject: [PATCH] . --- shared/_nmsg | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/shared/_nmsg b/shared/_nmsg index afad0d1..4c85491 100755 --- a/shared/_nmsg +++ b/shared/_nmsg @@ -52,14 +52,33 @@ then BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared fi -echo "BASE=${BASE}" -if [ -f ${BASE}/secrets/.${MYNAME} ] +# 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 + +echo "SECRETS=/zTools/zPrivateConfig" +if [ -f ${SECRETS}/secrets/.${MYNAME} ] then - . ${BASE}/secrets/.${MYNAME} + . ${SECRETS}/secrets/.${MYNAME} else -if [ -f ${BASE}/secrets/.ntfyenv ] +if [ -f ${SECRETS}/secrets/.ntfyenv ] then - . ${BASE}/secrets/.ntfyenv + . ${SECRETS}/secrets/.ntfyenv else if [ -z ${DUFUS+x} ] then