Add nifi-toolkit

nomr · Oct 15, 2017 · 37044f6 · 37044f6
1 parent f913841
commit 37044f6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -50,11 +50,11 @@ NIFI-$(VERSION)/meta: NIFI-$(VERSION) meta validator.jar
 	cat meta/parcel.json | jq ".version=\"$(VERSION)\"" > $@/parcel.json
 	java -jar validator.jar -p $@/parcel.json || (rm -rf $@ && false)
 
-NIFI-$(VERSION): nifi-$(NIFI_VERSION)-bin.tar.gz
+NIFI-$(VERSION): nifi-$(NIFI_VERSION) nifi-toolkit-$(NIFI_VERSION)
 	rm -rf $@
-	tar -zxf $<
-	mv nifi-$(NIFI_VERSION) $@
-	find $@/lib -type f -exec chmod o+r {} \;
+	mkdir -p $@/lib
+	mv nifi-$(NIFI_VERSION) $@/lib/nifi
+	mv nifi-toolkit-$(NIFI_VERSION) $@/lib/nifi-toolkit
 
 # Remote dependencies
 validator.jar:
@@ -69,6 +69,16 @@ nifi-$(NIFI_VERSION)-bin.tar.gz: nifi-$(NIFI_VERSION)-bin.tar.gz-SHA256
 	touch $@
 	sha256sum -c $<
 
+nifi-toolkit-$(NIFI_VERSION)-bin.tar.gz: nifi-toolkit-$(NIFI_VERSION)-bin.tar.gz-SHA256
+	wget 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=nifi/$(NIFI_VERSION)/$@' -O $@
+	touch $@
+	sha256sum -c $<
+
+
 # Implicit rules
 %-SHA256: SHA256SUMS
 	grep $(subst -SHA256,,$@) SHA256SUMS > $@
+
+%: %-bin.tar.gz
+	tar -zxvf $<
+	find $@/lib -type f -exec chmod o+r {} \;
diff --git a/SHA256SUMS b/SHA256SUMS
@@ -1 +1,2 @@
 d67c90deb50ed5fee44e7ebf61fbf870f2e97cf1c82ad0f598ff5c4ef905ce99 nifi-1.4.0-bin.tar.gz
+17acd515e90635b94530c8d601e1299d4d9947d2f18ed0e8a7fff649f03f7994 nifi-toolkit-1.4.0-bin.tar.gz
diff --git a/meta/nifi_env.sh b/meta/nifi_env.sh
@@ -1,2 +1,3 @@
 NIFI_DIRNAME=${PARCEL_DIRNAME:-"NIFI-1.4.0"}
-export CDH_NIFI_HOME=$PARCELS_ROOT/$NIFI_DIRNAME
+export CDH_NIFI_HOME=$PARCELS_ROOT/$NIFI_DIRNAME/lib/nifi
+export CDH_NIFI_TOOLKIT_HOME=$PARCELS_ROOT/$NIFI_DIRNAME/lib/nifi-toolkit
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		d67c90deb50ed5fee44e7ebf61fbf870f2e97cf1c82ad0f598ff5c4ef905ce99 nifi-1.4.0-bin.tar.gz
		17acd515e90635b94530c8d601e1299d4d9947d2f18ed0e8a7fff649f03f7994 nifi-toolkit-1.4.0-bin.tar.gz