Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-05-11 18:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

prepare for merge

Browse source 
autoupdate is functional as far as the test branch can tell
This commit is contained in:
Marco Ochse 2017-10-05 22:53:35 +00:00
parent 9ec38852ae
commit a584d9869e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
update.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
### test 2
################################################### ###################################################
# Do not change any contents of this script! # Do not change any contents of this script!
################################################### ###################################################
@ -20,8 +20,6 @@ if [ "$myWHOAMI" != "root" ]
exit exit
fi fi
echo "#############>>>>>> I just got updated WOOT"
# Check for existing tpot.yml # Check for existing tpot.yml
function fuCONFIGCHECK () { function fuCONFIGCHECK () {
echo "### Checking for T-Pot configuration file ..." echo "### Checking for T-Pot configuration file ..."
@ -68,7 +66,7 @@ function fuSELFUPDATE () {
echo "###### $myBLUE"No updates found in repository."$myWHITE" echo "###### $myBLUE"No updates found in repository."$myWHITE"
return return
fi fi
myRESULT=$(git diff --name-only origin/autoupdate | grep update.sh) myRESULT=$(git diff --name-only origin/17.06 | grep update.sh)
myLOCALSTAT=$(git status -uno | grep -c update.sh) myLOCALSTAT=$(git status -uno | grep -c update.sh)
if [ "$myRESULT" == "update.sh" ]; if [ "$myRESULT" == "update.sh" ];
then then