Clean up the bin/ directory some and remove things that aren't needed

Author: Bencodes

bin/bazel

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

bin/combine-buildkite

@@ -8,7 +8,7 @@ import requests
 
 _API_TOKEN = os.environ["BUILDKITE_API_TOKEN"]
 _BASE_URL = "https://api.buildkite.com/v2/organizations/"
-_BUILDKITE_AUTH_HEADERS = {"Authorization": f"Bearer {_API_TOKEN}"}
+_BUILDKITE_AUTH_HEADERS = {"Authorization": f"Bearer {_API_TOKEN}", "Content-Type": "application/json"}
 
 ansi_escape_8bit = re.compile(
     r"(?:\x1B[@-Z\\-_]|[\x80-\x9A\x9C-\x9F]|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~])"
@@ -27,12 +27,9 @@ def _build_parser() -> argparse.ArgumentParser:
 
 
 def _get_job_log(
-    org: str, pipeline: str, build_number: str, job_id: str
+    job_url: str
 ) -> str:
-    response = requests.get(
-        f"{_BASE_URL}/{org}/pipelines/{pipeline}/builds/{build_number}/jobs/{job_id}/log",
-        headers=_BUILDKITE_AUTH_HEADERS,
-    )
+    response = requests.get(job_url, headers=_BUILDKITE_AUTH_HEADERS)
     response.raise_for_status()
     return ansi_escape_8bit.sub("", response.json()["content"]).replace(
         "\r", ""
@@ -52,12 +49,8 @@ async def _main(org: str, pipeline: str, build_number: str) -> None:
     futures = []
 
     for job in build["jobs"]:
-        job_id = str(job["id"])
-        futures.append(
-            loop.run_in_executor(
-                None, _get_job_log, org, pipeline, build_number, job_id
-            )
-        )
+        log_url = str(job["log_url"])
+        futures.append(loop.run_in_executor(None, _get_job_log, log_url))
 
     for future in futures:
         combined_log += await future