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

[hiro@xxxxxxxxxxxxxx]

commit 3bfa07762976e9659dd8a9f94c0dc74d41317d81
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Fri Sep 27 21:28:26 2019 +0200

    Fix script
---
 scripts/update_files | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/update_files b/scripts/update_files
index d14fdff..a7e5918 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -35,9 +35,9 @@ for row in $(
       tr -d '",'
     );
     if [[ $r = *[!\ ]* ]]; then
-      wget $r
       git fetch --all
       git checkout releases
+      wget $r
       git add .
       git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads'
       diffs=$(git diff origin releases)
@@ -47,6 +47,7 @@ for row in $(
           git push -f --follow-tags origin releases
       fi
       git checkout torbrowser-releases
+      git merge releases
       diffs=$(git diff github torbrowser-releases)
       if [ -z "$diffs" ]; then
           echo "No new releases"

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits