scripts: Fix collect script bug URL

Correct the URL displayed when the user runs
`{cc|kata}-collect-data.sh -h`.

Fixes clearcontainers#971.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>

Makefile

@@ -43,13 +43,15 @@ CC_TYPE = cc
 CC_PROJECT_NAME = Intel® Clear Containers
 CC_PROJECT_TAG = clear-containers
 CC_PROJECT_URL = https://github.com/clearcontainers
+CC_BUG_URL = $(CC_PROJECT_URL)/runtime/issues/new
 
 # build type for Kata Containers
 KATA_TYPE = kata
 
 KATA_PROJECT_NAME = Kata Containers
 KATA_PROJECT_TAG = kata-containers
 KATA_PROJECT_URL = https://github.com/kata-containers
+KATA_BUG_URL = $(KATA_PROJECT_URL)/kata-containers/issues/new
 
 #------------------------------
 
@@ -116,13 +118,15 @@ ifeq ($(system_build_type),)
     PROJECT_NAME = $(CC_PROJECT_NAME)
     PROJECT_TAG = $(CC_PROJECT_TAG)
     PROJECT_URL = $(CC_PROJECT_URL)
+    PROJECT_BUG_URL = $(CC_BUG_URL)
 else
     ifeq ($(system_build_type),$(CC_TYPE))
         PROJECT_TYPE = $(CC_TYPE)
 
         PROJECT_NAME = $(CC_PROJECT_NAME)
         PROJECT_TAG = $(CC_PROJECT_TAG)
         PROJECT_URL = $(CC_PROJECT_URL)
+        PROJECT_BUG_URL = $(CC_BUG_URL)
     endif
 
     ifeq ($(system_build_type),$(KATA_TYPE))
@@ -131,6 +135,7 @@ else
         PROJECT_NAME = $(KATA_PROJECT_NAME)
         PROJECT_TAG = $(KATA_PROJECT_TAG)
         PROJECT_URL = $(KATA_PROJECT_URL)
+        PROJECT_BUG_URL = $(KATA_BUG_URL)
     endif
 endif
 
@@ -449,6 +454,7 @@ $(GENERATED_FILES): %: %.in Makefile VERSION
 		-e "s|@LOCALSTATEDIR@|$(LOCALSTATEDIR)|g" \
 		-e "s|@PKGLIBEXECDIR@|$(PKGLIBEXECDIR)|g" \
 		-e "s|@PROXYPATH@|$(PROXYPATH)|g" \
+		-e "s|@PROJECT_BUG_URL@|$(PROJECT_BUG_URL)|g" \
 		-e "s|@PROJECT_URL@|$(PROJECT_URL)|g" \
 		-e "s|@PROJECT_NAME@|$(PROJECT_NAME)|g" \
 		-e "s|@PROJECT_TAG@|$(PROJECT_TAG)|g" \

data/collect-data.sh.in

@@ -17,7 +17,7 @@
 script_name=${0##*/}
 runtime_name="@RUNTIME_NAME@"
 runtime=$(command -v "$runtime_name" 2>/dev/null)
-issue_url="@PROJECT_URL@/issues/new"
+issue_url="@PROJECT_BUG_URL@"
 script_version="@VERSION@ (commit @COMMIT@)"
 
 # Maximum number of errors to show for a single system component