This commit is contained in:
2022-07-18 10:05:01 +01:00
parent 3f9069ecb2
commit 472b1423de

View File

@ -26,28 +26,30 @@ then
BASE=/zTools/zPrivateConfig BASE=/zTools/zPrivateConfig
fi fi
# if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] if [ -d /zTools/zShared ]
# then then
# BASE=/static BASE=/zTools/zShared
# echo "BASE=${BASE}" fi
# fi
# if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
# then then
# BASE=/zTools/zShared BASE=/static
# echo "BASE=${BASE}" fi
# fi
# if [ ! -d /static ] && [ ! -d /zTools/zShared ] && [ -d /zTools/zPrivateConfig ] if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
# then then
# BASE=/zTools/zPrivateConfig BASE=/zTools/zShared
# echo "BASE=${BASE}" fi
# fi
if [ ! -d /static ] && [ ! -d /zTools/zShared ] && [ -d /zTools/zPrivateConfig ]
then
BASE=/zTools/zPrivateConfig
fi
MYNAME=$(uname -n) MYNAME=$(uname -n)
if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zPrivateConfig ] if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zShared ]
then then
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zPrivateConfig BASE=/volume12/zTools/Sync${MYNAME}/zTools/zShared
fi fi
echo "BASE=${BASE}" echo "BASE=${BASE}"
@ -55,16 +57,16 @@ if [ -f ${BASE}/secrets/.${MYNAME} ]
then then
. ${BASE}/secrets/.${MYNAME} . ${BASE}/secrets/.${MYNAME}
else else
if [ -f ${BASE}/secrets/.ntfyenv ] if [ -f ${BASE}/secrets/.ntfyenv ]
then
. ${BASE}/secrets/.ntfyenv
else
if [ -z ${DUFUS+x} ]
then then
. ${BASE}/secrets/.ntfyenv mkdir -p ${BASE}/secrets
else
if [ -z ${DUFUS+x} ]
then
mkdir -p ${BASE}/secrets
echo "Creat ${BASE}/secrets/.ntfyenv" echo "Creat ${BASE}/secrets/.ntfyenv"
echo "Please update contents and rerun" echo "Please update contents and rerun"
exit 1 exit 1
fi fi
fi fi
fi fi