From fd5a2824b6fb62c21daedff4bc92561d5bbb207a Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan@vmware.com>
Date: Fri, 10 Mar 2017 02:57:10 -0800
Subject: [PATCH] update per review.

---
 Makefile        | 51 ++++++++++++++++++++++++++++++-------------------
 make/install.sh | 16 +---------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index a17da89a6..40d08b568 100644
--- a/Makefile
+++ b/Makefile
@@ -264,18 +264,24 @@ package_online: modify_composefile
 	fi
 	@cp LICENSE $(HARBORPKG)/LICENSE
 	@cp NOTICE $(HARBORPKG)/NOTICE
-	@$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \
-	          --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/common/config\
-			  --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \
-			  --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \
-			  --exclude=$(HARBORPKG)/checkenv.sh \
-			  --exclude=$(HARBORPKG)/jsminify.sh \
-			  --exclude=$(HARBORPKG)/pushimage.sh \
-			  $(HARBORPKG)
-			
+
+	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+		$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \
+		          $(HARBORPKG)/common/templates $(HARBORPKG)/prepare \
+				  $(HARBORPKG)/LICENSE $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/install.sh $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
+				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME); \
+	else \
+		$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \
+		          $(HARBORPKG)/common/templates $(HARBORPKG)/prepare \
+				  $(HARBORPKG)/LICENSE $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/install.sh $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
+				  $(HARBORPKG)/harbor.cfg ; \
+	fi
+						
 	@rm -rf $(HARBORPKG)
 	@echo "Done."
-	
+		
 package_offline: compile build modify_composefile
 	@echo "packing offline package ..."
 	@cp -r make $(HARBORPKG)
@@ -313,16 +319,21 @@ package_offline: compile build modify_composefile
 		nginx:1.11.5 registry:2.5.1 photon:1.0 ; \
 	fi
 	
-	@$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
-	          --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/common/config\
-			  --exclude=$(HARBORPKG)/common/log --exclude=$(HARBORPKG)/ubuntu \
-			  --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \
-			  --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \
-			  --exclude=$(HARBORPKG)/checkenv.sh \
-			  --exclude=$(HARBORPKG)/jsminify.sh \
-			  --exclude=$(HARBORPKG)/pushimage.sh \
-			  $(HARBORPKG)
-	
+	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+		$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
+		          $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \
+				  $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/LICENSE $(HARBORPKG)/install.sh \
+				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) ; \
+	else \
+		$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
+		          $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \
+				  $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/LICENSE $(HARBORPKG)/install.sh \
+				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
+				  $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME) ; \
+	fi
+
 	@rm -rf $(HARBORPKG)
 	@echo "Done."
 
diff --git a/make/install.sh b/make/install.sh
index e10b36a02..54c2b10be 100755
--- a/make/install.sh
+++ b/make/install.sh
@@ -50,7 +50,7 @@ set -e
 set +o noglob
 
 usage=$'Please set hostname and other necessary attributes in harbor.cfg first. DO NOT use localhost or 127.0.0.1 for hostname, because Harbor needs to be accessed by external clients.
-Please set --with-notary if needs enable Notary in Harbor, and set ui_url_protocol in harbor.cfg to https bacause notary must run under https.'
+Please set --with-notary if needs enable Notary in Harbor, and set ui_url_protocol/ssl_cert/ssl_cert_key in harbor.cfg bacause notary must run under https.'
 item=0
 
 # notary is not enabled by default
@@ -80,20 +80,6 @@ then
 	exit 1
 fi
 
-# The ui_url_protocol in harbor.cfg has not been modified to https in notary mode
-if [ $with_notary ]
-then
-	if [[ $(cat ./harbor.cfg) =~ ui_url_protocol[[:blank:]]*=[[:blank:]]*(https?) ]]
-	then
-		protocol=${BASH_REMATCH[1]}
-		if [ "$protocol" != "https" ]
-		then 
-			warn "$usage"
-			exit 1
-		fi
-	fi
-fi
-
 function check_docker {
 	if ! docker --version &> /dev/null
 	then