This commit is contained in:
dz 2025-08-15 09:56:55 +02:00 committed by GitHub
commit f6f9e0bf42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -53,6 +53,7 @@ function fuCHECKINET () {
function fuSELFUPDATE () { function fuSELFUPDATE () {
echo echo
echo "### Now checking for newer files in repository ..." echo "### Now checking for newer files in repository ..."
echo "### T-Pot... TPOT_TYPE is set to: $myTPOT_TYPE"
git fetch --all git fetch --all
myREMOTESTAT=$(git status | grep -c "up-to-date") myREMOTESTAT=$(git status | grep -c "up-to-date")
if [ "$myREMOTESTAT" != "0" ]; if [ "$myREMOTESTAT" != "0" ];
@ -67,13 +68,31 @@ function fuSELFUPDATE () {
echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE" echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"
git reset --hard git reset --hard
git pull --force git pull --force
exec ./update.sh -y # check if myTPOT_TYPE is set
exit 1 if [ -z "$myTPOT_TYPE" ]; then
else exec ./update.sh
else
exec ./update.sh -y $myTPOT_TYPE
fi
else
echo "###### $myBLUE""Pulling updates from repository.""$myWHITE" echo "###### $myBLUE""Pulling updates from repository.""$myWHITE"
git reset --hard git reset --hard
git pull --force git pull --force
fi fi
if [ -z "$myTPOT_TYPE" ]; then
echo
else
grep -q "^TPOT_TYPE=" .env && sed -i "s/^TPOT_TYPE=.*/TPOT_TYPE=${myTPOT_TYPE}/" .env
echo "### T-Pot type set to: $myTPOT_TYPE in .env"
if [ "$myTPOT_TYPE" == "SENSOR" ]; then
echo "### Copying compose/sensor.yml to docker-compose.yml"
cp compose/sensor.yml docker-compose.yml
else
echo
fi
fi
exit 1
echo echo
} }
@ -194,6 +213,19 @@ function fuRESTORE () {
sed -i "s/^TPOT_VERSION=.*/TPOT_VERSION=${newVERSION}/" $HOME/tpotce/.env sed -i "s/^TPOT_VERSION=.*/TPOT_VERSION=${newVERSION}/" $HOME/tpotce/.env
} }
function fuREADTPOT_TYPE () {
if [ -f .env ]; then
# reads the TPOT_TYPE from the .env file
myTPOT_TYPE=$(grep -E '^TPOT_TYPE=' .env | cut -d '=' -f2)
# Verify if TPOT_TYPE is set
if [ -z "$myTPOT_TYPE" ]; then
myTPOT_TYPE="HIVE"
fi
else
myTPOT_TYPE="HIVE"
fi
}
################ ################
# Main section # # Main section #
################ ################
@ -211,11 +243,23 @@ if [ "$1" != "-y" ]; then
exit exit
fi fi
# if exists second argument, use it as T-Pot type, only if SENSOR or HIVE
if [ -n "$2" ]; then
if [[ "$2" == "SENSOR" || "$2" == "HIVE" ]]; then
myTPOT_TYPE="$2"
else
myTPOT_TYPE="HIVE"
fi
else
myTPOT_TYPE="HIVE"
fi
fuREADTPOT_TYPE
fuCHECK_VERSION fuCHECK_VERSION
fuCHECKINET "https://index.docker.io https://github.com" fuCHECKINET "https://index.docker.io https://github.com"
fuSTOP_TPOT fuSTOP_TPOT
fuBACKUP fuBACKUP
fuSELFUPDATE "$0" "$@" fuSELFUPDATE "$0" "$@" "$myTPOT_TYPE"
fuUPDATER fuUPDATER
fuRESTORE fuRESTORE