diff --git a/Makefile b/Makefile index b207931d..38d04f74 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,13 @@ REPO = https://github.com/yonaskolb/$(TOOL_NAME) RELEASE_TAR = $(REPO)/archive/$(VERSION).tar.gz SHA = $(shell curl -L -s $(RELEASE_TAR) | shasum -a 256 | sed 's/ .*//') SWIFT_BUILD_FLAGS = --disable-sandbox -c release --arch arm64 --arch x86_64 +EXECUTABLE_PATH = $(shell swift build $(SWIFT_BUILD_FLAGS) --show-bin-path)/$(EXECUTABLE_NAME) .PHONY: install build uninstall format_code brew release install: build mkdir -p $(PREFIX)/bin - cp -f $(shell swift build $(SWIFT_BUILD_FLAGS) --show-bin-path)/$(EXECUTABLE_NAME) $(INSTALL_PATH) + cp -f $(EXECUTABLE_PATH) $(INSTALL_PATH) mkdir -p $(SHARE_PATH) cp -R $(CURRENT_PATH)/SettingPresets $(SHARE_PATH)/SettingPresets @@ -45,4 +46,4 @@ brew: brew bump-formula-pr --url=$(RELEASE_TAR) XcodeGen archive: build - ./scripts/archive.sh + ./scripts/archive.sh $(EXECUTABLE_PATH) diff --git a/scripts/archive.sh b/scripts/archive.sh index 7ec329e4..ad335507 100755 --- a/scripts/archive.sh +++ b/scripts/archive.sh @@ -10,7 +10,7 @@ LICENSE=LICENSE # copy mkdir -p $BINDIR -cp -f .build/release/$EXECUTABLE_NAME $BINDIR +cp -f $1 $BINDIR mkdir -p $SHAREDIR cp -R SettingPresets $SHAREDIR/SettingPresets