From 09cf40618751edcd1a68125ab60447c0548c89d4 Mon Sep 17 00:00:00 2001
From: "Blake J. Harnden" <bharnden@users.noreply.github.com>
Date: Thu, 15 Mar 2018 11:30:11 -0700
Subject: [PATCH] moved daemon/sbin to daemon/scripts

---
 README.md                             | 2 +-
 daemon/Makefile.am                    | 4 ++--
 daemon/{sbin => scripts}/core-cleanup | 0
 daemon/{sbin => scripts}/core-daemon  | 0
 daemon/{sbin => scripts}/core-manage  | 0
 daemon/{sbin => scripts}/coresendmsg  | 0
 daemon/setup.py                       | 9 +--------
 7 files changed, 4 insertions(+), 11 deletions(-)
 rename daemon/{sbin => scripts}/core-cleanup (100%)
 rename daemon/{sbin => scripts}/core-daemon (100%)
 rename daemon/{sbin => scripts}/core-manage (100%)
 rename daemon/{sbin => scripts}/coresendmsg (100%)

diff --git a/README.md b/README.md
index 78ed828f..d5a1cf82 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Here is what is installed with 'make install':
 
     /usr/local/bin/core-gui
     /usr/local/bin/core-daemon
-    /usr/local/bin/[vcmd, vnoded, coresendmsg, core-cleanup.sh]
+    /usr/local/bin/[vcmd, vnoded, coresendmsg, core-cleanup]
     /usr/local/lib/core/*
     /usr/local/share/core/*
     /usr/local/lib/python2.6/dist-packages/core/*
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 78611022..ee8dc238 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -14,7 +14,7 @@ if WANT_DOCS
   SUBDIRS = doc
 endif
 
-SCRIPT_FILES := $(notdir $(wildcard sbin/*))
+SCRIPT_FILES := $(notdir $(wildcard scripts/*))
 MAN_FILES := $(notdir $(wildcard ../doc/man/*.1))
 
 LOGROTATE_DIR		= $(DESTDIR)/$(sysconfdir)/logrotate.d
@@ -72,7 +72,7 @@ EXTRA_DIST = $(SETUPPY) \
 	     data \
 	     doc/conf.py.in \
 	     examples \
-	     sbin \
+	     scripts \
 	     tests \
 	     test.py \
 	     setup.cfg \
diff --git a/daemon/sbin/core-cleanup b/daemon/scripts/core-cleanup
similarity index 100%
rename from daemon/sbin/core-cleanup
rename to daemon/scripts/core-cleanup
diff --git a/daemon/sbin/core-daemon b/daemon/scripts/core-daemon
similarity index 100%
rename from daemon/sbin/core-daemon
rename to daemon/scripts/core-daemon
diff --git a/daemon/sbin/core-manage b/daemon/scripts/core-manage
similarity index 100%
rename from daemon/sbin/core-manage
rename to daemon/scripts/core-manage
diff --git a/daemon/sbin/coresendmsg b/daemon/scripts/coresendmsg
similarity index 100%
rename from daemon/sbin/coresendmsg
rename to daemon/scripts/coresendmsg
diff --git a/daemon/setup.py b/daemon/setup.py
index 2783af42..9a3cbefd 100644
--- a/daemon/setup.py
+++ b/daemon/setup.py
@@ -11,8 +11,6 @@ from distutils.core import setup
 _CORE_DIR = "/etc/core"
 _MAN_DIR = "share/man/man1"
 _EXAMPLES_DIR = "share/core"
-_SYSV = "/etc/init.d"
-_SYSTEMD = "/etc/systemd/system"
 
 
 def recursive_files(data_path, files_path):
@@ -53,12 +51,7 @@ setup(
         "mock",
     ],
     data_files=data_files,
-    scripts=[
-        "sbin/core-cleanup",
-        "sbin/core-daemon",
-        "sbin/core-manage",
-        "sbin/coresendmsg",
-    ],
+    scripts=glob.glob("scripts/*"),
     description="Python components of CORE",
     url="http://www.nrl.navy.mil/itd/ncs/products/core",
     author="Boeing Research & Technology",