From 31c43c10bdc82a5b8517098f1cbef4d5e049936b Mon Sep 17 00:00:00 2001
From: Noah Campbell <noahcampbell@gmail.com>
Date: Wed, 17 Nov 2010 21:04:44 -0800
Subject: [PATCH] Add tools to /usr/bin

---
 packaging/Makefile     | 20 +++++++++++---------
 packaging/rundeck.spec | 10 ++++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packaging/Makefile b/packaging/Makefile
index 1747fa56bf9..180bdc1bd65 100644
--- a/packaging/Makefile
+++ b/packaging/Makefile
@@ -3,15 +3,17 @@ SHELL=/bin/bash
 .PHONY: rundeck.rpm
 
 rpm:
-	mkdir -p dist/RPMS/noarch
-	mkdir -p target/var/lib/rundeck
-	mkdir -p target/var/run/rundeck/exp/webapp
-	mkdir -p target/var/run/rundeck/{data,work,logs}
-	mkdir -p target/var/log/rundeck
-	mkdir -p target/var/rundeck/projects
-	cp -R root/* target
-	cp -R ../core/target/tools/lib/*.jar target/var/lib/rundeck
-	unzip -o ../rundeckapp/target/rundeck-1.0.0.war -d target/var/run/rundeck/exp/webapp/
+	@mkdir -p dist/RPMS/noarch
+	@mkdir -p target/usr/bin
+	@mkdir -p target/var/lib/rundeck
+	@mkdir -p target/var/run/rundeck/exp/webapp
+	@mkdir -p target/var/run/rundeck/{data,work,logs}
+	@mkdir -p target/var/log/rundeck
+	@mkdir -p target/var/rundeck/projects
+	@cp -R root/* target
+	@cp -R ../core/target/tools/lib/*.jar target/var/lib/rundeck
+	@find ../core/target/bin ! -regex ".*.bat$$" -and -type f | xargs -J Z cp Z target/usr/bin
+	@unzip -oq ../rundeckapp/target/rundeck-1.0.0.war -d target/var/run/rundeck/exp/webapp/
 	rpmbuild -bb --target=noarch --define "_topdir ${PWD}/dist" --buildroot="${PWD}/target" rundeck.spec 
     
 clean:
diff --git a/packaging/rundeck.spec b/packaging/rundeck.spec
index c6eeca53668..b37e3657dbd 100644
--- a/packaging/rundeck.spec
+++ b/packaging/rundeck.spec
@@ -87,7 +87,13 @@ fi
 /var/lib/rundeck/xerces-2.6.0.jar
 /var/lib/rundeck/xml-apis-2.6.0.jar
 
-
-
+# CLI Tools
+%attr(755, root, root) /usr/bin/run
+%attr(755, root, root) /usr/bin/dispatch
+%attr(755, root, root) /usr/bin/rd-check
+%attr(755, root, root) /usr/bin/rd-jobs
+%attr(755, root, root) /usr/bin/rd-project
+%attr(755, root, root) /usr/bin/rd-queue
+%attr(755, root, root) /usr/bin/rd-setup
 
 %changelog