This commit is contained in:
2022-06-26 10:10:04 +01:00
parent f9b061fdc2
commit df77e53e2f
3 changed files with 149 additions and 32 deletions

63
shared/_nfile Executable file
View File

@ -0,0 +1,63 @@
#!/bin/sh
echo $0
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 [ -f ${BASE}/secrets/.ntfyenv ]
then
. ${BASE}/secrets/.ntfyenv
else
echo "Created ${BASE}/secrets/.ntfyenv"
echo "Please update contents and rerun"
echo "DUFUS="" " > ${BASE}/secrets/.ntfyenv
echo "TCHATID="" " >> ${BASE}/secrets/.ntfyenv
exit 1
fi
SCRIPT=$1
MSG=$2
FILETOSEND=$3
MYNAME=`uname -n`
MSG=/var/tmp/${THIS_SCRIPT}.msg.$$
#if [ -e ${ERROR} ]
# then
# echo "---error_log_start" >> ${MSG}
# cat ${ERROR} >> ${MSG}
# echo "---error_log_finish" >> ${MSG}
SUBJECT=" ${MYNAME} - ${SCRIPT}: "
# cat ${FILETOSEND} > ${MSG}.txt
# FILE='document=@'"${MSG}.txt"
# curl -X POST \
# -F ${FILE} \
# -F "chat_id=${TCHATID}" \
# -F "caption=${SUBJECT} ${MSG}" \
# https://api.telegram.org/bot${DUFUS}/sendDocument
# rm -f ${MSG}
curl \
-d "${SUBJECT} ${MSG}" \
ntfy.sh/${DUFUS}
NAME=$(basename $FILETOSEND)
curl \
-T ${FILETOSEND} \
-H "Filename: ${NAME}" \
ntfy.sh/${DUFUS}

47
shared/_tfile Executable file
View File

@ -0,0 +1,47 @@
#!/bin/sh
if [ -d /zTools/zPrivateConfig/shared ] && [ ! -d /static ]
then
BASE=/zTools/zPrivateConfig/shared
fi
if [ ! -d /zTools/zPrivateConfig/shared ] && [ -d /static ]
then
BASE=/static
fi
if [ -f ${BASE}/secrets/.telegramenv ]
then
. ${BASE}/secrets/.telegramenv
else
echo "Created ${BASE}/secrets/.telegramenv"
echo "Please update contents and rerun"
echo "DUFUS="" " > ${BASE}/secrets/.telegramenv
echo "TCHATID="" " >> ${BASE}/secrets/.telegramenv
exit 1
fi
SCRIPT=$1
MSG=$2
FILETOSEND=$3
MYNAME=`uname -n`
MSG=/var/tmp/${THIS_SCRIPT}.msg.$$
#if [ -e ${ERROR} ]
# then
# echo "---error_log_start" >> ${MSG}
# cat ${ERROR} >> ${MSG}
# echo "---error_log_finish" >> ${MSG}
SUBJECT=" ${MYNAME} - ${SCRIPT}: "
cat ${FILETOSEND} > ${MSG}.txt
FILE='document=@'"${MSG}.txt"
curl -X POST \
-F ${FILE} \
-F "chat_id=${TCHATID}" \
-F "caption=${SUBJECT} ${MSG}" \
https://api.telegram.org/bot${DUFUS}/sendDocument
rm -f ${MSG}

View File

@ -1,47 +1,54 @@
#!/bin/sh #!/bin/sh
if [ -d /zTools/zPrivateConfig/shared ] && [ ! -d /static ] if [ ! -d /zTools/zPrivateConfig ] && [ -d /static ]
then
BASE=/zTools/zPrivateConfig/shared
fi
if [ ! -d /zTools/zPrivateConfig/shared ] && [ -d /static ]
then then
BASE=/static BASE=/static
fi fi
if [ -f ${BASE}/secrets/.telegramenv ] if [ -d /zTools/zPrivateConfig ] && [ ! -d /static ]
then then
. ${BASE}/secrets/.telegramenv BASE=/zTools/zPrivateConfig
else
echo "Created ${BASE}/secrets/.telegramenv"
echo "Please update contents and rerun"
echo "DUFUS="" " > ${BASE}/secrets/.telegramenv
echo "TCHATID="" " >> ${BASE}/secrets/.telegramenv
exit 1
fi fi
SCRIPT=$1 if [ -d /zTools/zShared ]
MSG=$2 then
FILETOSEND=$3 BASE=/zTools/zShared
MYNAME=`uname -n` fi
MSG=/var/tmp/${THIS_SCRIPT}.msg.$$ # if [ -f ${BASE}/secrets/.telegramenv ]
#if [ -e ${ERROR} ]
# then # then
# echo "---error_log_start" >> ${MSG} # . ${BASE}/secrets/.telegramenv
# cat ${ERROR} >> ${MSG} # else
# echo "---error_log_finish" >> ${MSG} # echo "Created ${BASE}/secrets/.telegramenv"
# echo "Please update contents and rerun"
# echo "DUFUS="" " > ${BASE}/secrets/.telegramenv
# echo "TCHATID="" " >> ${BASE}/secrets/.telegramenv
# exit 1
# fi
SUBJECT=" ${MYNAME} - ${SCRIPT}: " # SCRIPT=$1
# MSG=$2
# FILETOSEND=$3
# MYNAME=`uname -n`
cat ${FILETOSEND} > ${MSG}.txt # MSG=/var/tmp/${THIS_SCRIPT}.msg.$$
FILE='document=@'"${MSG}.txt" # #if [ -e ${ERROR} ]
# # then
# # echo "---error_log_start" >> ${MSG}
# # cat ${ERROR} >> ${MSG}
# # echo "---error_log_finish" >> ${MSG}
curl -X POST \ # SUBJECT=" ${MYNAME} - ${SCRIPT}: "
-F ${FILE} \
-F "chat_id=${TCHATID}" \
-F "caption=${SUBJECT} ${MSG}" \
https://api.telegram.org/bot${DUFUS}/sendDocument
rm -f ${MSG} # cat ${FILETOSEND} > ${MSG}.txt
# FILE='document=@'"${MSG}.txt"
# curl -X POST \
# -F ${FILE} \
# -F "chat_id=${TCHATID}" \
# -F "caption=${SUBJECT} ${MSG}" \
# https://api.telegram.org/bot${DUFUS}/sendDocument
# rm -f ${MSG}
${BASE}/shared/_nfile $1 $2 $3