From 9c624e8e52908805e9b421880f5c229d13ea1553 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jv@jviotti.com>
Date: Fri, 5 Jan 2018 11:51:33 -0400
Subject: [PATCH] chore: move updates disabling logic out of the Makefile
 (#1939)

The Makefile current has logic to disable updates when building deb or
rpm packages. To make the Concourse pipeline transition easier, the
logic that disables updates on deb and rpm has been moved to the main
application code.

Change-Type: patch
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
---
 Makefile            | 17 ++---------------
 lib/shared/store.js |  2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index b4b33395..e465c6bf 100644
--- a/Makefile
+++ b/Makefile
@@ -167,17 +167,6 @@ endif
 
 ELECTRON_BUILDER_OPTIONS = --$(TARGET_ARCH_ELECTRON_BUILDER)
 
-# ---------------------------------------------------------------------
-# Updates
-# ---------------------------------------------------------------------
-
-DISABLE_UPDATES_ELECTRON_BUILDER_OPTIONS = --extraMetadata.analytics.updates.enabled=false
-
-ifdef DISABLE_UPDATES
-$(warning Update notification dialog has been disabled (DISABLE_UPDATES is set))
-ELECTRON_BUILDER_OPTIONS += $(DISABLE_UPDATES_ELECTRON_BUILDER_OPTIONS)
-endif
-
 # ---------------------------------------------------------------------
 # Analytics
 # ---------------------------------------------------------------------
@@ -306,16 +295,14 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)-$(APPLICATION_VERSION_REDHAT).$(
 	build --linux rpm $(ELECTRON_BUILDER_OPTIONS) \
 		--extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \
 		--extraMetadata.version=$(APPLICATION_VERSION_REDHAT) \
-		--extraMetadata.packageType=rpm \
-		$(DISABLE_UPDATES_ELECTRON_BUILDER_OPTIONS)
+		--extraMetadata.packageType=rpm
 
 $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb: \
 	| $(BUILD_DIRECTORY)
 	build --linux deb $(ELECTRON_BUILDER_OPTIONS) \
 		--extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \
 		--extraMetadata.version=$(APPLICATION_VERSION_DEBIAN) \
-		--extraMetadata.packageType=deb \
-		$(DISABLE_UPDATES_ELECTRON_BUILDER_OPTIONS)
+		--extraMetadata.packageType=deb
 
 ifeq ($(TARGET_ARCH),x64)
 ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY = linux-unpacked
diff --git a/lib/shared/store.js b/lib/shared/store.js
index b244f8d3..96322dd1 100644
--- a/lib/shared/store.js
+++ b/lib/shared/store.js
@@ -48,7 +48,7 @@ const DEFAULT_STATE = Immutable.fromJS({
     errorReporting: true,
     unmountOnSuccess: true,
     validateWriteOnSuccess: true,
-    updatesEnabled: packageJSON.updates.enabled,
+    updatesEnabled: packageJSON.updates.enabled && !_.includes([ 'rpm', 'deb' ], packageJSON.packageType),
     includeUnstableUpdateChannel: !release.isStableRelease(packageJSON.version),
     lastSleptUpdateNotifier: null,
     lastSleptUpdateNotifierVersion: null