More sh->python use: supervisor.sh.

Deal with more bazel/python non-sense. py_binary cannot be made with an
imported entry point. There has to be a redundant local wrapper.

BUILD.bazel

@@ -209,13 +209,16 @@ pkg_tar(
     package_dir = "",
 )
 
-# This contains all of the binaries needed to run the topology generator.
+# This contains all of the binaries needed to run the topology generator
+# and start a local stack.
 pkg_tar(
     name = "scion-topo",
     srcs = [
         "//tools:set_ipv6_addr",
         "//tools:topodot",
         "//tools:topogen",
+        "//tools:supervisord",
+        "//tools:supervisorctl",
     ],
     mode = "0755",
 )

tools/BUILD.bazel

@@ -26,6 +26,26 @@ py_binary(
     ],
 )
 
+py_binary(
+    name = "supervisord",
+    srcs = ["supervisord.py"],
+    deps = [
+        requirement("supervisor"),
+        requirement("supervisor-wildcards"),
+    ],
+    visibility = ["//visibility:public"],
+)
+
+py_binary(
+    name = "supervisorctl",
+    srcs = ["supervisorctl.py"],
+    deps = [
+        requirement("supervisor"),
+        requirement("supervisor-wildcards"),
+    ],
+    visibility = ["//visibility:public"],
+)
+
 py_binary(
     name = "topogen",
     srcs = ["topogen.py"],

tools/supervisor.sh

@@ -6,7 +6,7 @@ mkdir -p logs
 OPTIONS="$@"
 CONF_FILE="tools/supervisord.conf"
 if [ ! -e /tmp/supervisor.sock ]; then
-    supervisord -c $CONF_FILE
+    bin/supervisord -c $CONF_FILE
 fi
-supervisorctl -c $CONF_FILE $OPTIONS
+bin/supervisorctl -c $CONF_FILE $OPTIONS
 

tools/supervisorctl.py

@@ -0,0 +1,13 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+# This is exact replica of supervisord's entry point because I haven't
+# found an intelligible way of creating a py_binary target that doesn't
+# define its own entry point.
+
+import re
+import sys
+from supervisor.supervisorctl import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

tools/supervisord.py

@@ -0,0 +1,13 @@
+# !/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+# This is exact replica of supervisord's entry point because I haven't
+# found an intelligible way of creating a py_binary target that doesn't
+# define its own entry point.
+
+import re
+import sys
+from supervisor.supervisord import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())