From 143b0fff0bbea33499d4a1f08036431dde2bc76b Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Tue, 5 Jan 2021 13:14:01 +0000
Subject: Clean up x86

---
 basilisk/base/content/aboutDialog.js            | 8 --------
 basilisk/installer/windows/nsis/defines.nsi.in  | 5 -----
 basilisk/installer/windows/nsis/installer.nsi   | 8 +-------
 basilisk/installer/windows/nsis/uninstaller.nsi | 6 +-----
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/basilisk/base/content/aboutDialog.js b/basilisk/base/content/aboutDialog.js
index f957162..8537146 100644
--- a/basilisk/base/content/aboutDialog.js
+++ b/basilisk/base/content/aboutDialog.js
@@ -61,14 +61,6 @@ function init(aEvent)
     document.getElementById("communityDesc").hidden = true;
   }
 
-  // Append "(32-bit)" or "(64-bit)" build architecture to the version number:
-  let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-  let archResource = Services.appinfo.is64Bit
-                     ? "aboutDialog.architecture.sixtyFourBit"
-                     : "aboutDialog.architecture.thirtyTwoBit";
-  let arch = bundle.GetStringFromName(archResource);
-  versionField.textContent += ` (${arch})`;
-
   // Get Release Notes URL from Preferences
   let releaseNotesURL = Services.prefs.getCharPref("app.releaseNotesURL");
   document.getElementById("releasenotes").setAttribute("href", releaseNotesURL);
diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in
index 8981bbd..d031911 100644
--- a/basilisk/installer/windows/nsis/defines.nsi.in
+++ b/basilisk/installer/windows/nsis/defines.nsi.in
@@ -40,14 +40,9 @@
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
-#ifdef HAVE_64BIT_BUILD
 !define HAVE_64BIT_BUILD
 !define ARCH "x64"
 !define MinSupportedVer "Microsoft Windows 7 x64"
-#else
-!define ARCH "x86"
-!define MinSupportedVer "Microsoft Windows 7"
-#endif
 
 !define MinSupportedCPU "SSE2"
 
diff --git a/basilisk/installer/windows/nsis/installer.nsi b/basilisk/installer/windows/nsis/installer.nsi
index 6b4b5ab..9c79302 100644
--- a/basilisk/installer/windows/nsis/installer.nsi
+++ b/basilisk/installer/windows/nsis/installer.nsi
@@ -123,11 +123,7 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 
 Name "${BrandFullName}"
 OutFile "setup.exe"
-!ifdef HAVE_64BIT_BUILD
-  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
-!else
-  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
-!endif
+InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 ShowInstDetails nevershow
 
 ################################################################################
@@ -1061,14 +1057,12 @@ Function .onInit
     Quit
   ${EndIf}
 
-!ifdef HAVE_64BIT_BUILD
   ${Unless} ${RunningX64}
     MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2
     ExecShell "open" "${URLSystemRequirements}"
     Quit
   ${EndUnless}
   SetRegView 64
-!endif
 
   ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
 
diff --git a/basilisk/installer/windows/nsis/uninstaller.nsi b/basilisk/installer/windows/nsis/uninstaller.nsi
index c556b0a..0388240 100644
--- a/basilisk/installer/windows/nsis/uninstaller.nsi
+++ b/basilisk/installer/windows/nsis/uninstaller.nsi
@@ -121,11 +121,7 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
 
 Name "${BrandFullName}"
 OutFile "helper.exe"
-!ifdef HAVE_64BIT_BUILD
-  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
-!else
-  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
-!endif
+InstallDir "$PROGRAMFILES64\${BrandFullName}\"
 ShowUnInstDetails nevershow
 
 ################################################################################
-- 
cgit v1.2.3