.
This commit is contained in:
@ -1,7 +1,22 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh -x
|
||||||
echo $0
|
echo $0
|
||||||
|
|
||||||
if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
|
# if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
|
||||||
|
# then
|
||||||
|
# BASE=/static
|
||||||
|
# fi
|
||||||
|
|
||||||
|
# if [ -d /zTools/zPrivateConfig ] && [ ! -d /static ]
|
||||||
|
# then
|
||||||
|
# BASE=/zTools/zPrivateConfig
|
||||||
|
# fi
|
||||||
|
|
||||||
|
# if [ -d /zTools/zShared ]
|
||||||
|
# then
|
||||||
|
# BASE=/zTools/zShared
|
||||||
|
# fi
|
||||||
|
|
||||||
|
if [ -d /static ] && [ ! -d /zTools ]
|
||||||
then
|
then
|
||||||
BASE=/static
|
BASE=/static
|
||||||
fi
|
fi
|
||||||
@ -19,23 +34,26 @@ fi
|
|||||||
if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
||||||
then
|
then
|
||||||
BASE=/static
|
BASE=/static
|
||||||
fi
|
else
|
||||||
|
|
||||||
if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
|
||||||
then
|
|
||||||
BASE=/zTools/zShared
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d /static ] && [ ! -d /zTools/zShared ] && [ -d /zTools/zPrivateConfig ]
|
|
||||||
then
|
|
||||||
BASE=/zTools/zPrivateConfig
|
BASE=/zTools/zPrivateConfig
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
||||||
|
# then
|
||||||
|
# BASE=/zTools/zShared
|
||||||
|
# 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/zSyno ]
|
# if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ]
|
||||||
then
|
# then
|
||||||
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno
|
# BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
if [ -d /zz/zPrivate/secrets ]
|
if [ -d /zz/zPrivate/secrets ]
|
||||||
then
|
then
|
||||||
@ -47,23 +65,48 @@ then
|
|||||||
SECRETS=/zz/zSyno
|
SECRETS=/zz/zSyno
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d /zz/zDocky/secrets ]
|
||||||
|
then
|
||||||
|
SECRETS=/zz/zDocky
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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=${SECRETS}"
|
echo "SECRETS=${SECRETS}"
|
||||||
if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ]
|
if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ]
|
||||||
then
|
then
|
||||||
. ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private
|
. ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private
|
||||||
else
|
else
|
||||||
if [ -f ${SECRETS}/secrets/.ntfyenv ]
|
# if [ -f ${SECRETS}/secrets/.ntfyenv ]
|
||||||
then
|
# then
|
||||||
. ${SECRETS}/secrets/.ntfyenv
|
# . ${SECRETS}/secrets/.ntfyenv
|
||||||
else
|
# else
|
||||||
if [ -z ${DUFUS+x} ]
|
if [ -z ${DUFUS+x} ]
|
||||||
then
|
then
|
||||||
mkdir -p ${SECRETS}/secrets
|
mkdir -p ${SECRETS}/secrets
|
||||||
echo "Create ${SECRETS}/secrets/.ntfyenv"
|
echo "Create ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private"
|
||||||
echo "Please update contents and rerun"
|
echo "Please update contents and rerun"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
# fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCRIPT=$1
|
SCRIPT=$1
|
||||||
|
|||||||
@ -1,7 +1,22 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh -x
|
||||||
echo $0
|
echo $0
|
||||||
|
|
||||||
if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
|
# if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
|
||||||
|
# then
|
||||||
|
# BASE=/static
|
||||||
|
# fi
|
||||||
|
|
||||||
|
# if [ -d /zTools/zPrivateConfig ] && [ ! -d /static ]
|
||||||
|
# then
|
||||||
|
# BASE=/zTools/zPrivateConfig
|
||||||
|
# fi
|
||||||
|
|
||||||
|
# if [ -d /zTools/zShared ]
|
||||||
|
# then
|
||||||
|
# BASE=/zTools/zShared
|
||||||
|
# fi
|
||||||
|
|
||||||
|
if [ -d /static ] && [ ! -d /zTools ]
|
||||||
then
|
then
|
||||||
BASE=/static
|
BASE=/static
|
||||||
fi
|
fi
|
||||||
@ -19,23 +34,26 @@ fi
|
|||||||
if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
||||||
then
|
then
|
||||||
BASE=/static
|
BASE=/static
|
||||||
fi
|
else
|
||||||
|
|
||||||
if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
|
||||||
then
|
|
||||||
BASE=/zTools/zShared
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d /static ] && [ ! -d /zTools/zShared ] && [ -d /zTools/zPrivateConfig ]
|
|
||||||
then
|
|
||||||
BASE=/zTools/zPrivateConfig
|
BASE=/zTools/zPrivateConfig
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# if [ ! -d /static ] && [ -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ]
|
||||||
|
# then
|
||||||
|
# BASE=/zTools/zShared
|
||||||
|
# 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/zSyno ]
|
# if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ]
|
||||||
then
|
# then
|
||||||
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno
|
# BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
if [ -d /zz/zPrivate/secrets ]
|
if [ -d /zz/zPrivate/secrets ]
|
||||||
then
|
then
|
||||||
@ -47,23 +65,48 @@ then
|
|||||||
SECRETS=/zz/zSyno
|
SECRETS=/zz/zSyno
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d /zz/zDocky/secrets ]
|
||||||
|
then
|
||||||
|
SECRETS=/zz/zDocky
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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=${SECRETS}"
|
echo "SECRETS=${SECRETS}"
|
||||||
if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ]
|
if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ]
|
||||||
then
|
then
|
||||||
. ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private
|
. ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private
|
||||||
else
|
else
|
||||||
if [ -f ${SECRETS}/secrets/.ntfyenvH ]
|
# if [ -f ${SECRETS}/secrets/.ntfyenv ]
|
||||||
then
|
# then
|
||||||
. ${SECRETS}/secrets/.ntfyenvH
|
# . ${SECRETS}/secrets/.ntfyenv
|
||||||
else
|
# else
|
||||||
if [ -z ${DUFUS+x} ]
|
if [ -z ${DUFUS+x} ]
|
||||||
then
|
then
|
||||||
mkdir -p ${SECRETS}/secrets
|
mkdir -p ${SECRETS}/secrets
|
||||||
echo "Create ${SECRETS}/secrets/.ntfyenv"
|
echo "Create ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private"
|
||||||
echo "Please update contents and rerun"
|
echo "Please update contents and rerun"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
# fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCRIPT=$1
|
SCRIPT=$1
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh -x
|
||||||
echo $0
|
echo $0
|
||||||
|
|
||||||
# if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
|
# if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
|
||||||
@ -50,10 +50,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
MYNAME=$(uname -n)
|
MYNAME=$(uname -n)
|
||||||
if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ]
|
# if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ]
|
||||||
then
|
# then
|
||||||
BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno
|
# BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
if [ -d /zz/zPrivate/secrets ]
|
if [ -d /zz/zPrivate/secrets ]
|
||||||
then
|
then
|
||||||
@ -65,6 +65,11 @@ then
|
|||||||
SECRETS=/zz/zSyno
|
SECRETS=/zz/zSyno
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d /zz/zDocky/secrets ]
|
||||||
|
then
|
||||||
|
SECRETS=/zz/zDocky
|
||||||
|
fi
|
||||||
|
|
||||||
# echo "BASE=${BASE}"
|
# echo "BASE=${BASE}"
|
||||||
# if [ -f ${BASE}/secrets/.${MYNAME} ]
|
# if [ -f ${BASE}/secrets/.${MYNAME} ]
|
||||||
# then
|
# then
|
||||||
@ -90,18 +95,18 @@ if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ]
|
|||||||
then
|
then
|
||||||
. ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private
|
. ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private
|
||||||
else
|
else
|
||||||
if [ -f ${SECRETS}/secrets/.ntfyenvH ]
|
# if [ -f ${SECRETS}/secrets/.ntfyenv ]
|
||||||
then
|
# then
|
||||||
. ${SECRETS}/secrets/.ntfyenvH
|
# . ${SECRETS}/secrets/.ntfyenv
|
||||||
else
|
# else
|
||||||
if [ -z ${DUFUS+x} ]
|
if [ -z ${DUFUS+x} ]
|
||||||
then
|
then
|
||||||
mkdir -p ${SECRETS}/secrets
|
mkdir -p ${SECRETS}/secrets
|
||||||
echo "Create ${SECRETS}/secrets/.ntfyenv"
|
echo "Create ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private"
|
||||||
echo "Please update contents and rerun"
|
echo "Please update contents and rerun"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
# fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCRIPT=$1
|
SCRIPT=$1
|
||||||
|
|||||||
Reference in New Issue
Block a user