This commit is contained in:
USER
2023-04-02 21:59:18 +01:00
parent 977e867a93
commit 11807a7736
8 changed files with 60 additions and 62 deletions

View File

@ -39,27 +39,27 @@ fi
if [ -d /zz/zPrivate/secrets ] if [ -d /zz/zPrivate/secrets ]
then then
BASE=/zz/zPrivate SECRETS=/zz/zPrivate
fi fi
if [ -d /zz/zSyno/secrets ] if [ -d /zz/zSyno/secrets ]
then then
BASE=/zz/zSyno SECRETS=/zz/zSyno
fi fi
echo "BASE=${BASE}" echo "SECRETS=${SECRETS}"
if [ -f ${BASE}/secrets/.${MYNAME} ] if [ -f ${SECRETS}/secrets/.${MYNAME} ]
then then
. ${BASE}/secrets/.${MYNAME} . ${SECRETS}/secrets/.${MYNAME}
else else
if [ -f ${BASE}/secrets/.ntfyenv ] if [ -f ${SECRETS}/secrets/.ntfyenv ]
then then
. ${BASE}/secrets/.ntfyenv . ${SECRETS}/secrets/.ntfyenv
else else
if [ -z ${DUFUS+x} ] if [ -z ${DUFUS+x} ]
then then
mkdir -p ${BASE}/secrets mkdir -p ${SECRETS}/secrets
echo "Creat ${BASE}/secrets/.ntfyenv" echo "Create ${SECRETS}/secrets/.ntfyenv"
echo "Please update contents and rerun" echo "Please update contents and rerun"
exit 1 exit 1
fi fi

View File

@ -39,27 +39,27 @@ fi
if [ -d /zz/zPrivate/secrets ] if [ -d /zz/zPrivate/secrets ]
then then
BASE=/zz/zPrivate SECRETS=/zz/zPrivate
fi fi
if [ -d /zz/zSyno/secrets ] if [ -d /zz/zSyno/secrets ]
then then
BASE=/zz/zSyno SECRETS=/zz/zSyno
fi fi
echo "BASE=${BASE}" echo "SECRETS=${SECRETS}"
if [ -f ${BASE}/secrets/.${MYNAME} ] if [ -f ${SECRETS}/secrets/.${MYNAME} ]
then then
. ${BASE}/secrets/.${MYNAME} . ${SECRETS}/secrets/.${MYNAME}
else else
if [ -f ${BASE}/secrets/.ntfyenvH ] if [ -f ${SECRETS}/secrets/.ntfyenvH ]
then then
. ${BASE}/secrets/.ntfyenvH . ${SECRETS}/secrets/.ntfyenvH
else else
if [ -z ${DUFUS+x} ] if [ -z ${DUFUS+x} ]
then then
mkdir -p ${BASE}/secrets mkdir -p ${SECRETS}/secrets
echo "Create ${BASE}/secrets/.ntfyenvH" echo "Create ${SECRETS}/secrets/.ntfyenv"
echo "Please update contents and rerun" echo "Please update contents and rerun"
exit 1 exit 1
fi fi

View File

@ -57,12 +57,12 @@ fi
if [ -d /zz/zPrivate/secrets ] if [ -d /zz/zPrivate/secrets ]
then then
BASE=/zz/zPrivate SECRETS=/zz/zPrivate
fi fi
if [ -d /zz/zSyno/secrets ] if [ -d /zz/zSyno/secrets ]
then then
BASE=/zz/zSyno SECRETS=/zz/zSyno
fi fi
# echo "BASE=${BASE}" # echo "BASE=${BASE}"
@ -84,9 +84,8 @@ fi
# fi # fi
# fi # fi
SECRETS=${BASE}
echo "SECRETS=${BASE}"
echo "SECRETS=${SECRETS}"
if [ -f ${SECRETS}/secrets/.${MYNAME} ] if [ -f ${SECRETS}/secrets/.${MYNAME} ]
then then
. ${SECRETS}/secrets/.${MYNAME} . ${SECRETS}/secrets/.${MYNAME}
@ -97,8 +96,8 @@ then
else else
if [ -z ${DUFUS+x} ] if [ -z ${DUFUS+x} ]
then then
mkdir -p ${BASE}/secrets mkdir -p ${SECRETS}/secrets
echo "Creat ${BASE}/secrets/.ntfyenv" echo "Create ${SECRETS}/secrets/.ntfyenv"
echo "Please update contents and rerun" echo "Please update contents and rerun"
exit 1 exit 1
fi fi

View File

@ -57,12 +57,12 @@ fi
if [ -d /zz/zPrivate/secrets ] if [ -d /zz/zPrivate/secrets ]
then then
BASE=/zz/zPrivate SECRETS=/zz/zPrivate
fi fi
if [ -d /zz/zSyno/secrets ] if [ -d /zz/zSyno/secrets ]
then then
BASE=/zz/zSyno SECRETS=/zz/zSyno
fi fi
# echo "BASE=${BASE}" # echo "BASE=${BASE}"
@ -84,9 +84,8 @@ fi
# fi # fi
# fi # fi
SECRETS=${BASE}
echo "SECRETS=${BASE}"
echo "SECRETS=${SECRETS}"
if [ -f ${SECRETS}/secrets/.${MYNAME} ] if [ -f ${SECRETS}/secrets/.${MYNAME} ]
then then
. ${SECRETS}/secrets/.${MYNAME} . ${SECRETS}/secrets/.${MYNAME}
@ -97,8 +96,8 @@ then
else else
if [ -z ${DUFUS+x} ] if [ -z ${DUFUS+x} ]
then then
mkdir -p ${BASE}/secrets mkdir -p ${SECRETS}/secrets
echo "Create ${BASE}/secrets/.ntfyenvH" echo "Create ${SECRETS}/secrets/.ntfyenv"
echo "Please update contents and rerun" echo "Please update contents and rerun"
exit 1 exit 1
fi fi

View File

@ -21,15 +21,15 @@ then
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared
fi fi
if [ -d /zz/zPrivate/secrets ] # if [ -d /zz/zPrivate/secrets ]
then # then
BASE=/zz/zPrivate # BASE=/zz/zPrivate
fi # fi
if [ -d /zz/zSyno/secrets ] # if [ -d /zz/zSyno/secrets ]
then # then
BASE=/zz/zSyno # BASE=/zz/zSyno
fi # fi
# if [ -f ${BASE}/secrets/.telegramenv ] # if [ -f ${BASE}/secrets/.telegramenv ]
# then # then
# . ${BASE}/secrets/.telegramenv # . ${BASE}/secrets/.telegramenv

View File

@ -21,15 +21,15 @@ then
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared
fi fi
if [ -d /zz/zPrivate/secrets ] # if [ -d /zz/zPrivate/secrets ]
then # then
BASE=/zz/zPrivate # BASE=/zz/zPrivate
fi # fi
if [ -d /zz/zSyno/secrets ] # if [ -d /zz/zSyno/secrets ]
then # then
BASE=/zz/zSyno # BASE=/zz/zSyno
fi # fi
# if [ -f ${BASE}/secrets/.telegramenv ] # if [ -f ${BASE}/secrets/.telegramenv ]
# then # then
# . ${BASE}/secrets/.telegramenv # . ${BASE}/secrets/.telegramenv

View File

@ -21,13 +21,13 @@ then
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared
fi fi
if [ -d /zz/zPrivate/secrets ] # if [ -d /zz/zPrivate/secrets ]
then # then
BASE=/zz/zPrivate # BASE=/zz/zPrivate
fi # fi
if [ -d /zz/zSyno/secrets ] # if [ -d /zz/zSyno/secrets ]
then # then
BASE=/zz/zSyno # BASE=/zz/zSyno
fi # fi
${BASE}/shared/_nmsg $1 $2 ${BASE}/shared/_nmsg $1 $2

View File

@ -22,15 +22,15 @@ then
fi fi
if [ -d /zz/zPrivate/secrets ] # if [ -d /zz/zPrivate/secrets ]
then # then
BASE=/zz/zPrivate # BASE=/zz/zPrivate
fi # fi
if [ -d /zz/zSyno/secrets ] # if [ -d /zz/zSyno/secrets ]
then # then
BASE=/zz/zSyno # BASE=/zz/zSyno
fi # fi
# if [ -f ${BASE}/secrets/.telegramenv ] # if [ -f ${BASE}/secrets/.telegramenv ]
# then # then