From 1103492193554f42d8b6991698c5d426d40c97fd Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 1 Aug 2017 10:27:59 -0400 Subject: [PATCH] refactor: address review comments from #1625 (#1647) That PR was merged in a rush, so this is the follow-up commit addressing the review comments made there. See: https://github.com/resin-io/etcher/pull/1625 Signed-off-by: Juan Cruz Viotti --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 73d24519..51125726 100644 --- a/Makefile +++ b/Makefile @@ -313,26 +313,27 @@ else ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY = linux-$(TARGET_ARCH_ELECTRON_BUILDER)-unpacked endif -$(BUILD_DIRECTORY)/$(ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY): +$(BUILD_DIRECTORY)/$(ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY)/$(APPLICATION_NAME_ELECTRON): | $(BUILD_DIRECTORY) $(NPX) build --dir --linux $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \ --extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.packageType=AppImage + touch $@ -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM).AppDir: \ - $(BUILD_DIRECTORY)/$(ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY) \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM).AppDir: \ + $(BUILD_DIRECTORY)/$(ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY)/$(APPLICATION_NAME_ELECTRON) \ | $(BUILD_DIRECTORY) ./scripts/build/electron-create-appdir.sh \ -n $(APPLICATION_NAME) \ -d "$(APPLICATION_DESCRIPTION)" \ - -p $< \ + -p $(dir $<) \ -r $(TARGET_ARCH) \ -b $(APPLICATION_NAME_ELECTRON) \ -i assets/icon.png \ -o $@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(TARGET_ARCH_APPIMAGE).AppImage: \ - $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM).AppDir \ + $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM).AppDir \ | $(BUILD_DIRECTORY) $(BUILD_TEMPORARY_DIRECTORY) ./scripts/build/electron-create-appimage-linux.sh \ -d $< \