Fix use-before-assignment

Summary: Fixing some more small issues w/ the release script that came in during refactoring.

Reviewed By: ttsugriy

fbshipit-source-id: e852237

Author: nataliejameson

tools/release/platforms/homebrew.py

@@ -241,7 +241,6 @@ def push_tap(git_repository, tap_path, version):
     git_url = "[email protected]:{}.git".format(git_repository)
 
     with tempfile.TemporaryDirectory() as temp_dir:
-        temp_dir = temp_dir.name
         logging.info("Cloning {} into {}".format(git_url, temp_dir))
         run(["git", "clone", git_url, temp_dir])
 
@@ -282,7 +281,7 @@ def validate_tap(homebrew_dir, tap_repository, version):
         )
         if moved:
             brew(homebrew_dir, ["uninstall", brew_target])
-        if output != "{}/buck: stable {}".format(tap_repository, version):
+        if "{}/buck: stable {}".format(tap_repository, version) not in output:
             raise ReleaseException(
                 "Expected version {} to be installed, but got this from `brew info {}`: {}".format(
                     version, tap_repository, output

tools/release/publish_release.py

@@ -310,6 +310,7 @@ def publish(
     chocolatey_token,
     deb_file,
     homebrew_file,
+    homebrew_dir,
     chocolatey_file,
 ):
     if args.upload_assets:
@@ -321,9 +322,9 @@ def publish(
                 publish_chocolatey(chocolatey_file, chocolatey_token)
         if homebrew_file:
             add_assets(release, github_token, homebrew_file)
-            validate_tap(args.tap_repository, args.version)
+            validate_tap(homebrew_dir, args.tap_repository, args.version)
             if args.homebrew_push_tap:
-                publish_tap_changes(args.version, args.tap_repository)
+                publish_tap_changes(homebrew_dir, args.tap_repository, args.version)
             else:
                 log_about_manual_tap_push(args.tap_repository)
 
@@ -346,6 +347,7 @@ def main():
 
     temp_dir = None
     temp_homebrew_dir = None
+    homebrew_file = None
 
     try:
         validate_environment(args)
@@ -377,6 +379,7 @@ def main():
             chocolatey_token,
             deb_file,
             homebrew_file,
+            homebrew_dir,
             chocolatey_file,
         )
 
@@ -395,7 +398,7 @@ def remove(path):
                 remove(temp_dir)
             if temp_homebrew_dir:
                 # If the person didn't want to publish, we need to keep this around
-                if not homebrew_file or not args.homebrew_push_tap:
+                if not homebrew_file or args.homebrew_push_tap:
                     remove(temp_homebrew_dir)