[tor-commits] [gettor/master] Fix script

[hiro at torproject.org]

commit efaf79de52ee320fcdf904d694d221be7095ea26
Author: hiro <hiro at torproject.org>
Date:   Fri Sep 27 21:07:02 2019 +0200

    Fix script
---
 scripts/check_service |  2 --
 scripts/update_files  | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/check_service b/scripts/check_service
index 4dab2bf..acc3640 100644
--- a/scripts/check_service
+++ b/scripts/check_service
@@ -61,9 +61,7 @@ def test_email_from_gmail(password):
 
                     if (MESSAGE_FROM == email_from) and (MESSAGE_SUBJECT == email_subject) and (MESSAGE_BODY in email_body):
                         mail.store(str(i), '+FLAGS', '\\Deleted')
-                        return OK, "Found correct gettor email."
                     else:
-                        print('if not working')
                         mail.store(str(i), '+FLAGS', '\\Deleted')
 
 
diff --git a/scripts/update_files b/scripts/update_files
index dac62e4..1b4d453 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -18,6 +18,13 @@ git push github --delete torbrowser-releases
 
 git fetch --all --prune
 
+git add .
+
+git checkout -b torbrowser-releases
+git push -f --follow-tags github torbrowser-releases
+git checkout git checkout -b releases
+git push -f --follow-tags origin releases
+
 for row in $(
     curl -s 'https://aus1.torproject.org/torbrowser/update_3/release/downloads.json' |
     jq -r '.downloads'
@@ -33,14 +40,14 @@ for row in $(
       git checkout -b releases
       git add .
       git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads'
-      diffs=$(git diff origin/releases)
+      diffs=$(git diff origin releases)
       if [ -z "$diffs" ]; then
           echo "No new releases"
       else
           git push -f --follow-tags origin releases
       fi
       git checkout -b torbrowser-releases
-      diffs=$(git diff github/torbrowser-releases)
+      diffs=$(git diff github torbrowser-releases)
       if [ -z "$diffs" ]; then
           echo "No new releases"
       else