From c28e21611538f1977e89d847bdaf181b659f89ed Mon Sep 17 00:00:00 2001
From: Florian Zschocke <florian.zschocke@devolo.de>
Date: Mon, 27 Jan 2020 21:46:23 +0100
Subject: [PATCH] Use GitHub org property in octokit calls

---
 build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index f9ec975f..ca356d34 100644
--- a/build.xml
+++ b/build.xml
@@ -802,7 +802,7 @@
 			releaseVersion="${project.version}"/>
 		<exec executable="bash" logError="true" >
 			<arg value="-c" />
-			<arg value="${octokit} -q edit_release fzs gitblit ${ghrelease.id} tag_name='${release.tag}'"></arg>
+			<arg value="${octokit} -q edit_release ${gh.org} gitblit ${ghrelease.id} tag_name='${release.tag}'"></arg>
 		</exec>
 		<ghPublishReleaseDraft
 			releaseid="${ghrelease.id}"/>
@@ -1100,11 +1100,11 @@
 			<echo>Creating release ${project.tag} draft on GitHub</echo>
 			<exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.id">
 				<arg value="-c" />
-				<arg value="${octokit} create_release fzs gitblit @{releasetag} name=${project.version} draft=true | cut -f2"></arg>
+				<arg value="${octokit} create_release ${gh.org} gitblit @{releasetag} name=${project.version} draft=true | cut -f2"></arg>
 			</exec>
 			<exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.upldUrl">
 				<arg value="-c" />
-				<arg value="${octokit} release fzs gitblit ${ghrelease.id} _filter=.upload_url | sed 's/{.*$/?name=/'"></arg>
+				<arg value="${octokit} release ${gh.org} gitblit ${ghrelease.id} _filter=.upload_url | sed 's/{.*$/?name=/'"></arg>
 			</exec>
 			<exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.notes">
 				<arg value="-c" />
@@ -1112,7 +1112,7 @@
 			</exec>
 			<exec executable="bash" logError="true" >
 				<arg value="-c" />
-				<arg value="${octokit} -q edit_release fzs gitblit ${ghrelease.id} body='${ghrelease.notes}'"></arg>
+				<arg value="${octokit} -q edit_release ${gh.org} gitblit ${ghrelease.id} body='${ghrelease.notes}'"></arg>
 			</exec>
 		</sequential>
 	</macrodef>
@@ -1145,7 +1145,7 @@
 			<echo>publishing GitHub release draft @{releaseid}</echo>
 			<exec executable="bash" logError="true" >
 				<arg value="-c" />
-				<arg value="${octokit} -q edit_release fzs gitblit @{releaseid} draft=false"></arg>
+				<arg value="${octokit} -q edit_release ${gh.org} gitblit @{releaseid} draft=false"></arg>
 			</exec>
 		</sequential>
 	</macrodef>
@@ -1160,7 +1160,7 @@
 		<sequential>
 			<exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.id">
 				<arg value="-c" />
-				<arg value="${octokit} list_releases fzs gitblit _filter='.[] | &quot;\(.name)\t\(.tag_name)\t\(.id)&quot;' | grep @{releaseVersion} | cut -f3"></arg>
+				<arg value="${octokit} list_releases ${gh.org} gitblit _filter='.[] | &quot;\(.name)\t\(.tag_name)\t\(.id)&quot;' | grep @{releaseVersion} | cut -f3"></arg>
 			</exec>
 		</sequential>
 	</macrodef>
-- 
2.39.5