From 93f487041c4c9d19ab1ebb1214fb6202c7a96954 Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Tue, 21 Jan 2020 13:26:11 +0300
Subject: [PATCH] Meke autoupdate service work for me

---
 .../unofficial/pref/centaury-branding.js         |  2 +-
 application/basilisk/confvars.sh                 | 16 ++--------------
 .../branding/unofficial/pref/mypal-branding.js   |  2 +-
 toolkit/mozapps/update/nsUpdateService.js        |  3 +--
 tools/update-packaging/Makefile.in               |  4 +++-
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/application/basilisk/branding/unofficial/pref/centaury-branding.js b/application/basilisk/branding/unofficial/pref/centaury-branding.js
index a5b617a53..93958c680 100644
--- a/application/basilisk/branding/unofficial/pref/centaury-branding.js
+++ b/application/basilisk/branding/unofficial/pref/centaury-branding.js
@@ -24,7 +24,7 @@ pref("app.releaseNotesURL", "about:blank");
 // Vendor home page
 pref("app.vendorURL", "about:");
 
-pref("app.update.url", "");
+pref("app.update.url", "https://raw.githubusercontent.com/Feodor2/Updserv/master/%PRODUCT%/%BUILD_TARGET%/%LOCALE%/update.xml");
 
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh
index 9130e5ae4..22d61b15e 100644
--- a/application/basilisk/confvars.sh
+++ b/application/basilisk/confvars.sh
@@ -15,20 +15,8 @@ if test "$OS_ARCH" = "WINNT" -o \
   MOZ_BUNDLED_FONTS=1
 fi
 
-# For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release
-# builds so add-on developers have something to target while maintaining
-# Firefox compatiblity.
-# To enable add "export CENTAURY_VERSION=1" to the .mozconfig file.
-# However, this will cause a full rebuild at 00:00 UTC every day so
-# don't export the variable if you are in development or don't care.
-# When not exported we fall back the value in the version*.txt file.
-if test -n "$CENTAURY_VERSION" ; then
-    MOZ_APP_VERSION=52.9.`date --utc '+%Y.%m.%d'`
-    MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'`
-else
-    MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
-    MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
-fi
+MOZ_APP_VERSION=52.9.`date --utc '+%Y.%m.%d'`
+MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'`
 
 MOZ_EXTENSIONS_DEFAULT=" gio"
 
diff --git a/application/palemoon/branding/unofficial/pref/mypal-branding.js b/application/palemoon/branding/unofficial/pref/mypal-branding.js
index cfa009f9b..142fb4773 100644
--- a/application/palemoon/branding/unofficial/pref/mypal-branding.js
+++ b/application/palemoon/branding/unofficial/pref/mypal-branding.js
@@ -13,4 +13,4 @@ pref("general.useragent.compatMode.firefox", true);
 
 // Updates disabled
 pref("app.update.enabled", false);
-pref("app.update.url", "");
+pref("app.update.url", "https://raw.githubusercontent.com/Feodor2/Updserv/master/%PRODUCT%/%BUILD_TARGET%/%LOCALE%/update.xml");
diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index dca0a007e..ed28c64f4 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -2582,8 +2582,7 @@ Checker.prototype = {
 
     // Otherwise, construct the update URL from component parts.
     if (!url) {
-      url = Services.prefs.getDefaultBranch(null).
-            getCharPref(PREF_APP_UPDATE_URL, "");
+      url = Services.prefs.getCharPref(PREF_APP_UPDATE_URL, "");
     }
 
     if (!url || url == "") {
diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in
index 7c55958b6..16a36d3e1 100644
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -55,7 +55,7 @@ dir-stage := $(call mkdir_deps,$(STAGE_DIR))
 
 complete-patch:: $(dir-stage)
 ifeq ($(OS_TARGET), WINNT)
-	test -f $(UNPACKAGE)
+#	test -f $(UNPACKAGE)
 	$(RM) -rf '$(PACKAGE_DIR)'
 	cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE)
 endif
@@ -66,6 +66,8 @@ endif
 ifdef MOZ_SIGN_CMD
 	$(MOZ_SIGN_CMD) -f mar '$(DIST)/$(COMPLETE_MAR)'
 endif
+	shasum --algorithm 512 '$(DIST)/$(COMPLETE_MAR)'
+	wc -c '$(DIST)/$(COMPLETE_MAR)'
 
 partial-patch:: $(dir-stage)
 	MAR=$(MAR_BIN) \