From 11807a77365bdebc5d29428e36365a1b4c5b769f Mon Sep 17 00:00:00 2001 From: USER Date: Sun, 2 Apr 2023 21:59:18 +0100 Subject: [PATCH] . --- shared/_nfile | 18 +++++++++--------- shared/_nfileH | 18 +++++++++--------- shared/_nmsg | 11 +++++------ shared/_nmsgH | 11 +++++------ shared/tfile | 16 ++++++++-------- shared/tfileH | 16 ++++++++-------- shared/tmsg | 16 ++++++++-------- shared/tmsgH | 16 ++++++++-------- 8 files changed, 60 insertions(+), 62 deletions(-) diff --git a/shared/_nfile b/shared/_nfile index c547c29..cd4eefd 100755 --- a/shared/_nfile +++ b/shared/_nfile @@ -39,27 +39,27 @@ fi if [ -d /zz/zPrivate/secrets ] then - BASE=/zz/zPrivate + SECRETS=/zz/zPrivate fi if [ -d /zz/zSyno/secrets ] then - BASE=/zz/zSyno + SECRETS=/zz/zSyno fi -echo "BASE=${BASE}" -if [ -f ${BASE}/secrets/.${MYNAME} ] +echo "SECRETS=${SECRETS}" +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 - mkdir -p ${BASE}/secrets - echo "Creat ${BASE}/secrets/.ntfyenv" + mkdir -p ${SECRETS}/secrets + echo "Create ${SECRETS}/secrets/.ntfyenv" echo "Please update contents and rerun" exit 1 fi diff --git a/shared/_nfileH b/shared/_nfileH index c98d914..5ae624b 100755 --- a/shared/_nfileH +++ b/shared/_nfileH @@ -39,27 +39,27 @@ fi if [ -d /zz/zPrivate/secrets ] then - BASE=/zz/zPrivate + SECRETS=/zz/zPrivate fi if [ -d /zz/zSyno/secrets ] then - BASE=/zz/zSyno + SECRETS=/zz/zSyno fi -echo "BASE=${BASE}" -if [ -f ${BASE}/secrets/.${MYNAME} ] +echo "SECRETS=${SECRETS}" +if [ -f ${SECRETS}/secrets/.${MYNAME} ] then - . ${BASE}/secrets/.${MYNAME} + . ${SECRETS}/secrets/.${MYNAME} else -if [ -f ${BASE}/secrets/.ntfyenvH ] +if [ -f ${SECRETS}/secrets/.ntfyenvH ] then - . ${BASE}/secrets/.ntfyenvH + . ${SECRETS}/secrets/.ntfyenvH else if [ -z ${DUFUS+x} ] then - mkdir -p ${BASE}/secrets - echo "Create ${BASE}/secrets/.ntfyenvH" + mkdir -p ${SECRETS}/secrets + echo "Create ${SECRETS}/secrets/.ntfyenv" echo "Please update contents and rerun" exit 1 fi diff --git a/shared/_nmsg b/shared/_nmsg index 6f9639a..c04eedf 100755 --- a/shared/_nmsg +++ b/shared/_nmsg @@ -57,12 +57,12 @@ fi if [ -d /zz/zPrivate/secrets ] then - BASE=/zz/zPrivate + SECRETS=/zz/zPrivate fi if [ -d /zz/zSyno/secrets ] then - BASE=/zz/zSyno + SECRETS=/zz/zSyno fi # echo "BASE=${BASE}" @@ -84,9 +84,8 @@ fi # fi # fi -SECRETS=${BASE} -echo "SECRETS=${BASE}" +echo "SECRETS=${SECRETS}" if [ -f ${SECRETS}/secrets/.${MYNAME} ] then . ${SECRETS}/secrets/.${MYNAME} @@ -97,8 +96,8 @@ then else if [ -z ${DUFUS+x} ] then - mkdir -p ${BASE}/secrets - echo "Creat ${BASE}/secrets/.ntfyenv" + mkdir -p ${SECRETS}/secrets + echo "Create ${SECRETS}/secrets/.ntfyenv" echo "Please update contents and rerun" exit 1 fi diff --git a/shared/_nmsgH b/shared/_nmsgH index ca9833e..aea484b 100755 --- a/shared/_nmsgH +++ b/shared/_nmsgH @@ -57,12 +57,12 @@ fi if [ -d /zz/zPrivate/secrets ] then - BASE=/zz/zPrivate + SECRETS=/zz/zPrivate fi if [ -d /zz/zSyno/secrets ] then - BASE=/zz/zSyno + SECRETS=/zz/zSyno fi # echo "BASE=${BASE}" @@ -84,9 +84,8 @@ fi # fi # fi -SECRETS=${BASE} -echo "SECRETS=${BASE}" +echo "SECRETS=${SECRETS}" if [ -f ${SECRETS}/secrets/.${MYNAME} ] then . ${SECRETS}/secrets/.${MYNAME} @@ -97,8 +96,8 @@ then else if [ -z ${DUFUS+x} ] then - mkdir -p ${BASE}/secrets - echo "Create ${BASE}/secrets/.ntfyenvH" + mkdir -p ${SECRETS}/secrets + echo "Create ${SECRETS}/secrets/.ntfyenv" echo "Please update contents and rerun" exit 1 fi diff --git a/shared/tfile b/shared/tfile index 94141d9..f9f4df6 100755 --- a/shared/tfile +++ b/shared/tfile @@ -21,15 +21,15 @@ then BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared fi -if [ -d /zz/zPrivate/secrets ] -then - BASE=/zz/zPrivate -fi +# if [ -d /zz/zPrivate/secrets ] +# then +# BASE=/zz/zPrivate +# fi -if [ -d /zz/zSyno/secrets ] -then - BASE=/zz/zSyno -fi +# if [ -d /zz/zSyno/secrets ] +# then +# BASE=/zz/zSyno +# fi # if [ -f ${BASE}/secrets/.telegramenv ] # then # . ${BASE}/secrets/.telegramenv diff --git a/shared/tfileH b/shared/tfileH index 8bcc808..52637d1 100755 --- a/shared/tfileH +++ b/shared/tfileH @@ -21,15 +21,15 @@ then BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared fi -if [ -d /zz/zPrivate/secrets ] -then - BASE=/zz/zPrivate -fi +# if [ -d /zz/zPrivate/secrets ] +# then +# BASE=/zz/zPrivate +# fi -if [ -d /zz/zSyno/secrets ] -then - BASE=/zz/zSyno -fi +# if [ -d /zz/zSyno/secrets ] +# then +# BASE=/zz/zSyno +# fi # if [ -f ${BASE}/secrets/.telegramenv ] # then # . ${BASE}/secrets/.telegramenv diff --git a/shared/tmsg b/shared/tmsg index 4768f60..a7ed8fd 100755 --- a/shared/tmsg +++ b/shared/tmsg @@ -21,13 +21,13 @@ then BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared fi -if [ -d /zz/zPrivate/secrets ] -then - BASE=/zz/zPrivate -fi +# if [ -d /zz/zPrivate/secrets ] +# then +# BASE=/zz/zPrivate +# fi -if [ -d /zz/zSyno/secrets ] -then - BASE=/zz/zSyno -fi +# if [ -d /zz/zSyno/secrets ] +# then +# BASE=/zz/zSyno +# fi ${BASE}/shared/_nmsg $1 $2 diff --git a/shared/tmsgH b/shared/tmsgH index 091ed02..91592c4 100755 --- a/shared/tmsgH +++ b/shared/tmsgH @@ -22,15 +22,15 @@ then fi -if [ -d /zz/zPrivate/secrets ] -then - BASE=/zz/zPrivate -fi +# if [ -d /zz/zPrivate/secrets ] +# then +# BASE=/zz/zPrivate +# fi -if [ -d /zz/zSyno/secrets ] -then - BASE=/zz/zSyno -fi +# if [ -d /zz/zSyno/secrets ] +# then +# BASE=/zz/zSyno +# fi # if [ -f ${BASE}/secrets/.telegramenv ] # then