From 70edfa384b6fbb8168e171d23668ba741560084f Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Mon, 11 Sep 2017 10:45:28 -0400 Subject: [PATCH] chore: fix CLI packaging snapshot relative directory (#1713) The current CLI releases are broken. Seems that `pkg` creates the application snapshot based on the current working directory, so at the moment, the snapshot gets created based on the root of the project, rather than based on the dist/Etcher-cli-* directories, causing the native add-ons to not be resolved correctly. Fixes: https://github.com/resin-io/etcher/issues/1706 Change-Type: patch Signed-off-by: Juan Cruz Viotti --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9acf0447..4290e20d 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ TARGET_ARCH_ELECTRON_BUILDER = $(shell ./scripts/build/architecture-convert.sh - PLATFORM_PKG = $(shell ./scripts/build/platform-convert.sh -r $(PLATFORM) -t pkg) ENTRY_POINT_CLI = lib/cli/etcher.js ETCHER_CLI_BINARY = $(APPLICATION_NAME_LOWERCASE) -ifeq ($(TARGET_PLATFORM),win32) +ifeq ($(PLATFORM),win32) ETCHER_CLI_BINARY = $(APPLICATION_NAME_LOWERCASE).exe endif @@ -228,7 +228,7 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$( $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH)-app \ | $(BUILD_DIRECTORY) mkdir $@ - $(NPX) pkg --output $@/$(ETCHER_CLI_BINARY) -t node6-$(PLATFORM_PKG)-$(TARGET_ARCH) $