update, refactory to master

This commit is contained in:
Daniel Ortiz 2025-07-12 21:03:48 -04:00
parent 87733c6b65
commit 59c6672df7

View file

@ -53,7 +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 "### fuSELFUPDATE T-Pot... TPOT_TYPE is set to: $myTPOT_TYPE" 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" ];
@ -62,7 +62,7 @@ function fuSELFUPDATE () {
return return
fi fi
### DEV ### DEV
myRESULT=$(git diff --name-only origin/update | grep "^update.sh") myRESULT=$(git diff --name-only origin/master | grep "^update.sh")
if [ "$myRESULT" == "update.sh" ]; if [ "$myRESULT" == "update.sh" ];
then then
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"
@ -77,7 +77,7 @@ function fuSELFUPDATE () {
else else
echo "###### $myBLUE""Pulling updates from repository.""$myWHITE" echo "###### $myBLUE""Pulling updates from repository.""$myWHITE"
git reset --hard git reset --hard
git pull origin update --force git pull origin --force
fi fi
if [ -z "$myTPOT_TYPE" ]; then if [ -z "$myTPOT_TYPE" ]; then
echo echo
@ -88,7 +88,7 @@ function fuSELFUPDATE () {
echo "### Copying compose/sensor.yml to docker-compose.yml" echo "### Copying compose/sensor.yml to docker-compose.yml"
cp compose/sensor.yml docker-compose.yml cp compose/sensor.yml docker-compose.yml
else else
echo "### No docker-compose-sensor.yml found, using default docker-compose.yml" echo
fi fi
fi fi
exit 1 exit 1
@ -257,11 +257,11 @@ fi
fuREADTPOT_TYPE 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" "$@" "$myTPOT_TYPE" fuSELFUPDATE "$0" "$@" "$myTPOT_TYPE"
#fuUPDATER fuUPDATER
#fuRESTORE fuRESTORE
echo echo
echo "### Done. You can now start T-Pot using 'systemctl start tpot' or 'docker compose up -d'." echo "### Done. You can now start T-Pot using 'systemctl start tpot' or 'docker compose up -d'."