From 71931a0ea8d99e46f0ce088d71dd15141fc431df Mon Sep 17 00:00:00 2001
From: Luna Duclos <luna.duclos@embark-studios.com>
Date: Tue, 24 May 2022 12:15:49 +0200
Subject: [PATCH 1/3] Add a native.sh_binary wrapping around the buildifier
 rule

---
 buildifier/buildifier.bzl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/buildifier/buildifier.bzl b/buildifier/buildifier.bzl
index 42445e7d0..a97698929 100644
--- a/buildifier/buildifier.bzl
+++ b/buildifier/buildifier.bzl
@@ -17,7 +17,7 @@ _buildifier = rule(
     executable = True,
 )
 
-def buildifier(**kwargs):
+def buildifier(name=None, tags=[], **kwargs):
     """
     Wrapper for the _buildifier rule. Adds 'manual' to the tags.
 
@@ -25,11 +25,17 @@ def buildifier(**kwargs):
       **kwargs: all parameters for _buildifier
     """
 
-    tags = kwargs.get("tags", [])
     if "manual" not in tags:
-        tags.append("manual")
-        kwargs["tags"] = tags
-    _buildifier(**kwargs)
+        tags = tags + ["manual"]
+
+    _buildifier(name="{}.sh".format(name), tags=tags, **kwargs)
+
+    native.sh_binary(
+        name = name,
+        srcs = ["{}.sh".format(name)],
+        data = [":{}.sh".format(name)],
+        tags=tags,
+    )
 
 def _buildifier_test_impl(ctx):
     return [buildifier_impl_factory(ctx, test_rule = True)]

From b4ae2d42688237fd8903d32c6b447428a6fd6328 Mon Sep 17 00:00:00 2001
From: Luna Duclos <luna.duclos@embark-studios.com>
Date: Tue, 24 May 2022 12:28:15 +0200
Subject: [PATCH 2/3] Run buildifier

---
 buildifier/buildifier.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildifier/buildifier.bzl b/buildifier/buildifier.bzl
index a97698929..66df83bee 100644
--- a/buildifier/buildifier.bzl
+++ b/buildifier/buildifier.bzl
@@ -17,7 +17,7 @@ _buildifier = rule(
     executable = True,
 )
 
-def buildifier(name=None, tags=[], **kwargs):
+def buildifier(name = None, tags = [], **kwargs):
     """
     Wrapper for the _buildifier rule. Adds 'manual' to the tags.
 
@@ -28,13 +28,13 @@ def buildifier(name=None, tags=[], **kwargs):
     if "manual" not in tags:
         tags = tags + ["manual"]
 
-    _buildifier(name="{}.sh".format(name), tags=tags, **kwargs)
+    _buildifier(name = "{}.sh".format(name), tags = tags, **kwargs)
 
     native.sh_binary(
         name = name,
         srcs = ["{}.sh".format(name)],
         data = [":{}.sh".format(name)],
-        tags=tags,
+        tags = tags,
     )
 
 def _buildifier_test_impl(ctx):

From 841a7dcbd7fa7775e76ad7593ee1d66bf2f16a8d Mon Sep 17 00:00:00 2001
From: Luna Duclos <luna.duclos@embark-studios.com>
Date: Tue, 24 May 2022 12:31:36 +0200
Subject: [PATCH 3/3] Lint stuff

---
 buildifier/buildifier.bzl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildifier/buildifier.bzl b/buildifier/buildifier.bzl
index 66df83bee..ae8c08e73 100644
--- a/buildifier/buildifier.bzl
+++ b/buildifier/buildifier.bzl
@@ -19,9 +19,11 @@ _buildifier = rule(
 
 def buildifier(name = None, tags = [], **kwargs):
     """
-    Wrapper for the _buildifier rule. Adds 'manual' to the tags.
+    Wrapper for the _buildifier rule. Adds 'manual' to the tags and ensures windows compatibility.
 
     Args:
+      name: The name to be used for the rule
+      tags: The tags to be used for the rule
       **kwargs: all parameters for _buildifier
     """