From 52e8313722d89dbf3c360df80b28bf1ab19d1b6e Mon Sep 17 00:00:00 2001
From: Peter Portante <peter.portante@redhat.com>
Date: Tue, 28 Jun 2022 12:15:15 -0400
Subject: [PATCH] Remove wayward "shbangs" in Python 3 library files (#2917)

And we also remove the unnecessary `cli/getconf.py` file.

This work was identified while reviewing PR #2901.
---
 lib/pbench/agent/tool_meister.py       | 1 -
 lib/pbench/agent/tool_meister_start.py | 1 -
 lib/pbench/agent/tool_meister_stop.py  | 1 -
 lib/pbench/cli/getconf.py              | 6 ------
 lib/pbench/cli/server/shell.py         | 1 -
 setup.cfg                              | 2 +-
 6 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 lib/pbench/cli/getconf.py

diff --git a/lib/pbench/agent/tool_meister.py b/lib/pbench/agent/tool_meister.py
index 4c76e028fc..e7755d8b23 100644
--- a/lib/pbench/agent/tool_meister.py
+++ b/lib/pbench/agent/tool_meister.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- mode: python -*-
 
 """pbench-tool-meister
diff --git a/lib/pbench/agent/tool_meister_start.py b/lib/pbench/agent/tool_meister_start.py
index 0a1347d4c1..c0fe387b88 100644
--- a/lib/pbench/agent/tool_meister_start.py
+++ b/lib/pbench/agent/tool_meister_start.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- mode: python -*-
 
 """pbench-tool-meister-start - start the execution of the Tool Meister
diff --git a/lib/pbench/agent/tool_meister_stop.py b/lib/pbench/agent/tool_meister_stop.py
index 7620980341..d074266f60 100644
--- a/lib/pbench/agent/tool_meister_stop.py
+++ b/lib/pbench/agent/tool_meister_stop.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- mode: python -*-
 
 """pbench-tool-meister-stop
diff --git a/lib/pbench/cli/getconf.py b/lib/pbench/cli/getconf.py
deleted file mode 100644
index 49e70c8e83..0000000000
--- a/lib/pbench/cli/getconf.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/python3
-
-from pbench.common.conf import main
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/pbench/cli/server/shell.py b/lib/pbench/cli/server/shell.py
index 31563a0d4b..9ee7abecc6 100644
--- a/lib/pbench/cli/server/shell.py
+++ b/lib/pbench/cli/server/shell.py
@@ -1,4 +1,3 @@
-#!/bin/env python3
 from logging import Logger
 import os
 from pathlib import Path
diff --git a/setup.cfg b/setup.cfg
index cb2459d6ba..f1ce84d85a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,7 +27,7 @@ console_scripts =
    pbench-cleanup = pbench.cli.agent.commands.cleanup:main
    pbench-clear-results = pbench.cli.agent.commands.results.clear:main
    pbench-clear-tools = pbench.cli.agent.commands.tools.clear:main
-   pbench-config = pbench.cli.getconf:main
+   pbench-config = pbench.common.conf:main
    pbench-tree-manage = pbench.cli.server.tree_manage:tree_manage
    pbench-generate-token = pbench.cli.agent.commands.generate_token:main
    pbench-is-local = pbench.cli.agent.commands.is_local:main