diff --git a/shared/_nmsg b/shared/_nmsg index 16d08b6..dd1385a 100755 --- a/shared/_nmsg +++ b/shared/_nmsg @@ -21,9 +21,9 @@ then BASE=/static fi -if [ ! -d /static ] && [ -d /zTools ] +if [ ! -d /static ] && [ -d /zTools/zPrivateConfig ] then - BASE=/zTools + BASE=/zTools/zPrivateConfig fi # if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] @@ -45,27 +45,27 @@ fi # fi MYNAME=$(uname -n) -if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zShared ] +if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zPrivateConfig ] then - BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared + BASE=/volume12/zTools/Sync${MYNAME}/zTools/zPrivateConfig fi - + echo "BASE=${BASE}" -if [ -f ${BASE}/secrets/.ntfyenv ] +if [ -f ${BASE}/secrets/.${MYNAME} ] then - . ${BASE}/secrets/.ntfyenv + . ${BASE}/secrets/.${MYNAME} else - if [ -z ${DUFUS+x} ] + if [ -f ${BASE}/secrets/.ntfyenv ] then - mkdir -p ${BASE}/secrets - echo "Created ${BASE}/secrets/.ntfyenv" - echo "Please update contents and rerun" - echo "DUFUS="" " > ${BASE}/secrets/.ntfyenv - echo "TCHATID="" " >> ${BASE}/secrets/.ntfyenv - exit 1 + . ${BASE}/secrets/.ntfyenv else - mkdir -p ${BASE}/secrets - echo "DUFUS=${DUFUS}" > ${BASE}/secrets/.ntfyenv + 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