Update Windows updater for Zotero 7

.gitattributes

@@ -1,3 +1,4 @@
 *.sql text eol=lf
 app/win/zotero.exe.tar.xz filter=lfs diff=lfs merge=lfs -text
 app/mac/updater.tar.xz filter=lfs diff=lfs merge=lfs -text
+app/win/updater.exe.tar.xz filter=lfs diff=lfs merge=lfs -text

app/build.sh

@@ -638,21 +638,6 @@ if [ $BUILD_WIN == 1 ]; then
 		perl -pi -e "s/\{\{VERSION}}/$VERSION/" "$BUILD_DIR/win_installer/defines.nsi"
 		mkdir "$COMMON_APPDIR/uninstall"
 		
-		# Use our own updater, because Mozilla's requires updates signed by Mozilla
-		cp "$CALLDIR/win/updater.exe" "$COMMON_APPDIR"
-		cat "$CALLDIR/win/installer/updater_append.ini" >> "$COMMON_APPDIR/updater.ini"
-		
-		# Sign updater
-		if [ $SIGN -eq 1 ]; then
-			"`cygpath -u \"$SIGNTOOL\"`" \
-				sign /n "$SIGNTOOL_CERT_SUBJECT" \
-				/d "$SIGNATURE_DESC Updater" \
-				/fd SHA256 \
-				/tr "$SIGNTOOL_TIMESTAMP_SERVER" \
-				/td SHA256 \
-				"`cygpath -w \"$COMMON_APPDIR/updater.exe\"`"
-		fi
-		
 		# Compress 7zSD.sfx
 		upx --best -o "`cygpath -w \"$BUILD_DIR/7zSD.sfx\"`" \
 			"`cygpath -w \"$CALLDIR/win/installer/7zstub/firefox/7zSD.sfx\"`" > /dev/null
@@ -690,6 +675,21 @@ if [ $BUILD_WIN == 1 ]; then
 				--set-product-version "$VERSION"
 		fi
 		
+		# Use our own updater, because Mozilla's requires updates signed by Mozilla
+		tar xf "$CALLDIR/win/updater.exe.tar.xz" --to-stdout updater-$arch.exe > "$APPDIR/updater.exe"
+		cat "$CALLDIR/win/installer/updater_append.ini" >> "$APPDIR/updater.ini"
+		
+		# Sign updater
+		if [ $SIGN -eq 1 ]; then
+			"`cygpath -u \"$SIGNTOOL\"`" \
+				sign /n "$SIGNTOOL_CERT_SUBJECT" \
+				/d "$SIGNATURE_DESC Updater" \
+				/fd SHA256 \
+				/tr "$SIGNTOOL_TIMESTAMP_SERVER" \
+				/td SHA256 \
+				"`cygpath -w \"$APPDIR/updater.exe\"`"
+		fi
+		
 		# Copy app files
 		rsync -a "$base_dir/" "$APPDIR/"
 		#mv "$APPDIR/app/application.ini" "$APPDIR/"

app/win/mozconfig

@@ -24,3 +24,6 @@ ac_add_options --enable-official-branding
 export MOZILLA_OFFICIAL=1
 export RELEASE_OR_BETA=1
 MOZ_REQUIRE_SIGNING=
+
+# Build updater without MAR signature verification
+ac_add_options --disable-verify-mar