Fix make package command (realm#3890)

coffmark · Apr 11, 2022 · fe81196 · fe81196
1 parent 033f283
commit fe81196
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,11 @@
   body opening brace on a new line.  
   [Tobisaninfo](https://github.com/Tobisaninfo)
 
+* Fix SwiftLint.pkg installer installing multiple copies of SwiftLint.  
+  [JP Simard](https://github.com/jpsim)
+  [#3815](https://github.com/realm/SwiftLint/issues/3815)
+  [#3887](https://github.com/realm/SwiftLint/issues/3887)
+
 ## 0.46.5: Laundry Studio
 
 #### Breaking

diff --git a/Makefile b/Makefile
@@ -111,12 +111,14 @@ zip_linux: docker_image
 	cp -f "$(LICENSE_PATH)" "$(TMP_FOLDER)"
 	(cd "$(TMP_FOLDER)"; zip -yr - "swiftlint" "LICENSE") > "./swiftlint_linux.zip"
 
-package: installables
+package: build
+	$(eval PACKAGE_ROOT := $(shell mktemp -d))
+	cp "$(SWIFTLINT_EXECUTABLE)" "$(PACKAGE_ROOT)"
 	pkgbuild \
 		--identifier "io.realm.swiftlint" \
 		--install-location "/usr/local/bin" \
-		--root "$(TEMPORARY_FOLDER)" \
-		--version "$(VERSION_STRING)" \
+		--root "$(PACKAGE_ROOT)" \
+		--version $(VERSION_STRING) \
 		"$(OUTPUT_PACKAGE)"
 
 release: package portable_zip zip_linux