From c903bdc575cef8e0db974428d66660169fa067d6 Mon Sep 17 00:00:00 2001
From: "tlimoncelli@stackexchange.com" <tlimoncelli@stackexchange.com>
Date: Thu, 28 Aug 2014 14:37:25 +0000
Subject: [PATCH] Change package name to stack_blackbox

---
 Makefile                                 |  2 +-
 tools/build_rpm.sh                       | 10 ++++++----
 tools/profile.d-usrblackbox.sh           |  2 ++
 tools/{manifest.txt => rpm_filelist.txt} |  1 +
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 tools/profile.d-usrblackbox.sh
 rename tools/{manifest.txt => rpm_filelist.txt} (88%)

diff --git a/Makefile b/Makefile
index d0170fa..399a49e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all:
 	@echo '  make install           (incomplete)
 
 packages:
-	PKGRELEASE="$${PKGRELEASE}" $(BIN)/build_rpm.sh blackbox tools/manifest.txt
+	PKGRELEASE="$${PKGRELEASE}" $(BIN)/build_rpm.sh stack_blackbox tools/rpm_filelist.txt
 
 install:
 	@echo 'To install, copy the files from bin to somewhere in your PATH.'
diff --git a/tools/build_rpm.sh b/tools/build_rpm.sh
index 64f2447..cdf3d13 100755
--- a/tools/build_rpm.sh
+++ b/tools/build_rpm.sh
@@ -41,17 +41,19 @@ rm -rf "$OUTPUTDIR"
 mkdir -p "$OUTPUTDIR/installroot"
 
 # Copy the files into place:
-cat """$@""" | while read -a arr ; do
+cat """$@""" | grep -v '^$' | while read -a arr ; do
   PERM="${arr[0]}"
+  DEST="${arr[1]}"
+  SRC="${arr[2]}"
+  echo ========== "$PERM $DEST"
   case $PERM in
     \#*)  continue ;;   # Skip comments.
     exec) PERM=0755 ;;
     read) PERM=0744 ;;
     *) ;;
   esac
-  DST="$OUTPUTDIR/installroot/${arr[1]}"
-  SRC="${arr[2]}"
-  install -D -T -b -m "$PERM" -T "$SRC" "$DST"
+  FULLDEST="$OUTPUTDIR/installroot/${arr[1]}"
+  install -D -T -b -m "$PERM" -T "$SRC" "$FULLDEST"
 done
 
 # Build the RPM:
diff --git a/tools/profile.d-usrblackbox.sh b/tools/profile.d-usrblackbox.sh
new file mode 100644
index 0000000..6c69b47
--- /dev/null
+++ b/tools/profile.d-usrblackbox.sh
@@ -0,0 +1,2 @@
+# Prepend to $PATH.
+pathmunge /usr/blackbox/bin
diff --git a/tools/manifest.txt b/tools/rpm_filelist.txt
similarity index 88%
rename from tools/manifest.txt
rename to tools/rpm_filelist.txt
index e3dfe88..6f6520c 100644
--- a/tools/manifest.txt
+++ b/tools/rpm_filelist.txt
@@ -6,3 +6,4 @@ exec /usr/blackbox/bin/blackbox_postdeploy        bin/blackbox_postdeploy.sh
 exec /usr/blackbox/bin/blackbox_register_new_file bin/blackbox_register_new_file.sh
 exec /usr/blackbox/bin/blackbox_update_all_files  bin/blackbox_update_all_files.sh
 exec /usr/blackbox/bin/blackbox_start             bin/start
+read /etc/profile.d/usrblackbox.sh                tools/profile.d-usrblackbox.sh