From 86476cc30ffa443e464280a57e284d71a70d8ba2 Mon Sep 17 00:00:00 2001 From: USER Date: Sat, 24 Aug 2024 10:57:14 +0100 Subject: [PATCH] . --- shared/_nfile | 85 +++++++++++++++++++++++++++++++++++++------------- shared/_nfileH | 85 +++++++++++++++++++++++++++++++++++++------------- shared/_nmsgH | 27 +++++++++------- 3 files changed, 144 insertions(+), 53 deletions(-) diff --git a/shared/_nfile b/shared/_nfile index b283a14..e4f0eee 100755 --- a/shared/_nfile +++ b/shared/_nfile @@ -1,7 +1,22 @@ -#!/bin/sh +#!/bin/sh -x 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 BASE=/static fi @@ -19,23 +34,26 @@ fi if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] then BASE=/static -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 +else BASE=/zTools/zPrivateConfig 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) -if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ] -then - BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno -fi +# if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ] +# then +# BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno +# fi if [ -d /zz/zPrivate/secrets ] then @@ -47,23 +65,48 @@ then SECRETS=/zz/zSyno 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}" if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ] then . ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private else -if [ -f ${SECRETS}/secrets/.ntfyenv ] -then - . ${SECRETS}/secrets/.ntfyenv -else +# if [ -f ${SECRETS}/secrets/.ntfyenv ] +# then +# . ${SECRETS}/secrets/.ntfyenv +# else if [ -z ${DUFUS+x} ] then mkdir -p ${SECRETS}/secrets - echo "Create ${SECRETS}/secrets/.ntfyenv" + echo "Create ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private" echo "Please update contents and rerun" exit 1 fi - fi + # fi fi SCRIPT=$1 diff --git a/shared/_nfileH b/shared/_nfileH index 0c2e79a..712049a 100755 --- a/shared/_nfileH +++ b/shared/_nfileH @@ -1,7 +1,22 @@ -#!/bin/sh +#!/bin/sh -x 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 BASE=/static fi @@ -19,23 +34,26 @@ fi if [ -d /static ] && [ ! -d /zTools/zShared ] && [ ! -d /zTools/zPrivateConfig ] then BASE=/static -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 +else BASE=/zTools/zPrivateConfig 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) -if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ] -then - BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno -fi +# if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ] +# then +# BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno +# fi if [ -d /zz/zPrivate/secrets ] then @@ -47,23 +65,48 @@ then SECRETS=/zz/zSyno 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}" if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ] then . ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private else -if [ -f ${SECRETS}/secrets/.ntfyenvH ] -then - . ${SECRETS}/secrets/.ntfyenvH -else +# if [ -f ${SECRETS}/secrets/.ntfyenv ] +# then +# . ${SECRETS}/secrets/.ntfyenv +# else if [ -z ${DUFUS+x} ] then mkdir -p ${SECRETS}/secrets - echo "Create ${SECRETS}/secrets/.ntfyenv" + echo "Create ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private" echo "Please update contents and rerun" exit 1 fi - fi + # fi fi SCRIPT=$1 diff --git a/shared/_nmsgH b/shared/_nmsgH index da3ce06..a76b3d0 100755 --- a/shared/_nmsgH +++ b/shared/_nmsgH @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -x echo $0 # if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ] @@ -50,10 +50,10 @@ fi MYNAME=$(uname -n) -if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ] -then - BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno -fi +# if [ -d /volume12/zTools/Sync${MYNAME}/zTools/zSyno ] +# then +# BASE=/volume12/zTools/Sync${MYNAME}/zTools/zSyno +# fi if [ -d /zz/zPrivate/secrets ] then @@ -65,6 +65,11 @@ then SECRETS=/zz/zSyno fi +if [ -d /zz/zDocky/secrets ] +then + SECRETS=/zz/zDocky +fi + # echo "BASE=${BASE}" # if [ -f ${BASE}/secrets/.${MYNAME} ] # then @@ -90,18 +95,18 @@ if [ -f ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private ] then . ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private else -if [ -f ${SECRETS}/secrets/.ntfyenvH ] -then - . ${SECRETS}/secrets/.ntfyenvH -else +# if [ -f ${SECRETS}/secrets/.ntfyenv ] +# then +# . ${SECRETS}/secrets/.ntfyenv +# else if [ -z ${DUFUS+x} ] then mkdir -p ${SECRETS}/secrets - echo "Create ${SECRETS}/secrets/.ntfyenv" + echo "Create ${SECRETS}/secrets/.${MYNAME}.${LOGNAME}.private" echo "Please update contents and rerun" exit 1 fi - fi + # fi fi SCRIPT=$1