mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-07-02 04:52:11 +00:00
tweaking
This commit is contained in:
parent
f417872414
commit
a8a5c8cd84
1 changed files with 11 additions and 29 deletions
40
update.sh
40
update.sh
|
@ -1,9 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
###################################################
|
|
||||||
# Do not change any contents of this script!!
|
|
||||||
###################################################
|
|
||||||
|
|
||||||
# Some vars
|
# Some vars
|
||||||
myCONFIGFILE="/opt/tpot/etc/tpot.yml"
|
myCONFIGFILE="/opt/tpot/etc/tpot.yml"
|
||||||
myCOMPOSEPATH="/opt/tpot/etc/compose"
|
myCOMPOSEPATH="/opt/tpot/etc/compose"
|
||||||
|
@ -27,6 +23,7 @@ function fuCONFIGCHECK () {
|
||||||
else
|
else
|
||||||
echo "[ $myGREEN""OK""$myWHITE ]"
|
echo "[ $myGREEN""OK""$myWHITE ]"
|
||||||
fi
|
fi
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
# Let's test the internet connection
|
# Let's test the internet connection
|
||||||
|
@ -48,6 +45,7 @@ mySITES=$1
|
||||||
echo "[ $myGREEN"OK"$myWHITE ]"
|
echo "[ $myGREEN"OK"$myWHITE ]"
|
||||||
fi
|
fi
|
||||||
done;
|
done;
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update
|
# Update
|
||||||
|
@ -61,22 +59,15 @@ function fuSELFUPDATE () {
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
myRESULT=$(git diff --name-only origin/18.04 | grep update.sh)
|
myRESULT=$(git diff --name-only origin/18.04 | grep update.sh)
|
||||||
myLOCALSTAT=$(git status -uno | grep -c update.sh)
|
|
||||||
if [ "$myRESULT" == "update.sh" ];
|
if [ "$myRESULT" == "update.sh" ];
|
||||||
then
|
then
|
||||||
if [ "$myLOCALSTAT" == "0" ];
|
echo "###### $myBLUE""Found newer version, will update myself and restart.""$myWHITE"
|
||||||
then
|
|
||||||
echo "###### $myBLUE""Found newer version, will update myself and restart.""$myWHITE"
|
|
||||||
git reset --hard
|
|
||||||
git pull --force
|
|
||||||
exec "$1" "$2"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "###### $myBLUE""Update script is already up-to-date.""$myWHITE"
|
|
||||||
git reset --hard
|
git reset --hard
|
||||||
git pull --force
|
git pull --force
|
||||||
|
exec "$1" "$2"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
# Let's check for version
|
# Let's check for version
|
||||||
|
@ -99,6 +90,7 @@ if [ -f "version" ];
|
||||||
echo "###### $myBLUE""Unable to determine version. Please run 'update.sh' from within '/opt/tpot'.""$myWHITE"" [ $myRED""NOT OK""$myWHITE ]"
|
echo "###### $myBLUE""Unable to determine version. Please run 'update.sh' from within '/opt/tpot'.""$myWHITE"" [ $myRED""NOT OK""$myWHITE ]"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -117,6 +109,7 @@ if [ $? -ne 0 ];
|
||||||
else
|
else
|
||||||
echo "[ $myGREEN"OK"$myWHITE ]"
|
echo "[ $myGREEN"OK"$myWHITE ]"
|
||||||
fi
|
fi
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
# Backup
|
# Backup
|
||||||
|
@ -139,6 +132,7 @@ if [ $? -ne 0 ];
|
||||||
echo "[ $myGREEN"OK"$myWHITE ]"
|
echo "[ $myGREEN"OK"$myWHITE ]"
|
||||||
cd $myPATH
|
cd $myPATH
|
||||||
fi
|
fi
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
# Let's load docker images in parallel
|
# Let's load docker images in parallel
|
||||||
|
@ -149,6 +143,7 @@ for name in $(cat $myTPOTCOMPOSE | grep -v '#' | grep image | cut -d'"' -f2 | un
|
||||||
docker pull $name &
|
docker pull $name &
|
||||||
done
|
done
|
||||||
wait
|
wait
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
function fuUPDATER () {
|
function fuUPDATER () {
|
||||||
|
@ -176,11 +171,11 @@ echo
|
||||||
|
|
||||||
echo "### Now pulling latest docker images"
|
echo "### Now pulling latest docker images"
|
||||||
fuPULLIMAGES
|
fuPULLIMAGES
|
||||||
echo
|
|
||||||
|
|
||||||
echo "### If you made changes to tpot.yml please ensure to add them again."
|
echo "### If you made changes to tpot.yml please ensure to add them again."
|
||||||
echo "### We stored the previous version as backup in /root/."
|
echo "### We stored the previous version as backup in /root/."
|
||||||
echo "### Done, please reboot."
|
echo "### Done, please reboot."
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -207,22 +202,9 @@ if [ "$1" != "-y" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fuCHECK_VERSION
|
fuCHECK_VERSION
|
||||||
echo
|
|
||||||
|
|
||||||
fuCONFIGCHECK
|
fuCONFIGCHECK
|
||||||
echo
|
|
||||||
|
|
||||||
fuCHECKINET "https://index.docker.io https://github.com https://pypi.python.org https://ubuntu.com"
|
fuCHECKINET "https://index.docker.io https://github.com https://pypi.python.org https://ubuntu.com"
|
||||||
echo
|
|
||||||
|
|
||||||
fuSTOP_TPOT
|
fuSTOP_TPOT
|
||||||
echo
|
|
||||||
|
|
||||||
fuBACKUP
|
fuBACKUP
|
||||||
echo
|
|
||||||
|
|
||||||
fuSELFUPDATE "$0" "$@"
|
fuSELFUPDATE "$0" "$@"
|
||||||
echo
|
|
||||||
|
|
||||||
fuUPDATER
|
fuUPDATER
|
||||||
echo
|
|
||||||
|
|
Loading…
Reference in a new issue