From cdd13135c3b3b6158d13ca060b72eac44d6618cc Mon Sep 17 00:00:00 2001
From: EAZYBLACK <eazyblack@noreply.localhost>
Date: Sun, 13 Sep 2026 11:00:22 +0300
Subject: [PATCH] Remove Company from install path so its not
 Dactyloidae\Dactyloidae

---
 browser/installer/windows/nsis/installer.nsi   | 16 ++++++++--------
 browser/installer/windows/nsis/uninstaller.nsi | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
index 2dc30ba447..f7a009faf7 100644
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -125,9 +125,9 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 Name "${BrandFullName}"
 OutFile "setup.exe"
 !ifdef HAVE_64BIT_BUILD
-  InstallDir "$PROGRAMFILES64\${CompanyName}\${BrandShortName}\"
+  InstallDir "$PROGRAMFILES64\${BrandShortName}\"
 !else
-  InstallDir "$PROGRAMFILES32\${CompanyName}\${BrandShortName}\"
+  InstallDir "$PROGRAMFILES32\${BrandShortName}\"
 !endif
 ShowInstDetails nevershow
 
@@ -246,10 +246,10 @@ Section "-InstallStartCleanup"
   ${EndIf}
 
   ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\${CompanyName}\${BrandShortName}\TaskBarIDs"
+  ${InitHashAppModelId} "$INSTDIR" "Software\${BrandShortName}\TaskBarIDs"
 
   ; Remove the updates directory for Vista and above
-  ${CleanUpdateDirectories} "${CompanyName}\${BrandShortName}" "${CompanyName}\updates"
+  ${CleanUpdateDirectories} "${BrandShortName}" "${CompanyName}\updates"
 
   ${RemoveDeprecatedFiles}
   ${RemovePrecompleteEntries} "false"
@@ -355,9 +355,9 @@ Section "-Application" APP_IDX
     ${RegCleanUninstall}
     ${UpdateProtocolHandlers}
 
-    ReadRegStr $0 HKLM "Software\${CompanyName}\${BrandShortName}" "CurrentVersion"
+    ReadRegStr $0 HKLM "Software\${BrandShortName}" "CurrentVersion"
     ${If} "$0" != "${GREVersion}"
-      WriteRegStr HKLM "Software\${CompanyName}\${BrandShortName}" "CurrentVersion" "${GREVersion}"
+      WriteRegStr HKLM "Software\${BrandShortName}" "CurrentVersion" "${GREVersion}"
     ${EndIf}
   ${EndIf}
 
@@ -584,7 +584,7 @@ Section "-InstallEndCleanup"
       ; If we have something other than empty string now, write the value.
       ${If} "$0" != ""
         ClearErrors
-        WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "OldDefaultBrowserCommand" "$0"
+        WriteRegStr HKCU "Software\${BrandShortName}" "OldDefaultBrowserCommand" "$0"
       ${EndIf}
 
       ${LogHeader} "Setting as the default browser"
@@ -600,7 +600,7 @@ Section "-InstallEndCleanup"
     ${ElseIfNot} ${Errors}
       ${LogHeader} "Writing default-browser opt-out"
       ClearErrors
-      WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "DefaultBrowserOptOut" "True"
+      WriteRegStr HKCU "Software\${BrandShortName}" "DefaultBrowserOptOut" "True"
       ${If} ${Errors}
         ${LogMsg} "Error writing default-browser opt-out"
       ${EndIf}
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
index 0ed6958e27..af9c518a16 100644
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -121,9 +121,9 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
 Name "${BrandFullName}"
 OutFile "helper.exe"
 !ifdef HAVE_64BIT_BUILD
-  InstallDir "$PROGRAMFILES64\${CompanyName}\${BrandShortName}\"
+  InstallDir "$PROGRAMFILES64\${BrandShortName}\"
 !else
-  InstallDir "$PROGRAMFILES32\${CompanyName}\${BrandShortName}\"
+  InstallDir "$PROGRAMFILES32\${BrandShortName}\"
 !endif
 ShowUnInstDetails nevershow
 
@@ -193,7 +193,7 @@ Section "Uninstall"
   ${EndIf}
 
   ; setup the application model id registration value
-  ${un.InitHashAppModelId} "$INSTDIR" "Software\${CompanyName}\${BrandShortName}\TaskBarIDs"
+  ${un.InitHashAppModelId} "$INSTDIR" "Software\${BrandShortName}\TaskBarIDs"
 
   SetShellVarContext current  ; Set SHCTX to HKCU
   ${un.RegCleanMain} "Software\${CompanyName}"
@@ -207,11 +207,11 @@ Section "Uninstall"
   ${EndIf}
 
   ; Remove the updates directory for Vista and above
-  ${un.CleanUpdateDirectories} "${CompanyName}\${BrandShortName}" "${CompanyName}\updates"
+  ${un.CleanUpdateDirectories} "${BrandShortName}" "${CompanyName}\updates"
 
   ; Remove any app model id's stored in the registry for this install path
-  DeleteRegValue HKCU "Software\${CompanyName}\${BrandShortName}\TaskBarIDs" "$INSTDIR"
-  DeleteRegValue HKLM "Software\${CompanyName}\${BrandShortName}\TaskBarIDs" "$INSTDIR"
+  DeleteRegValue HKCU "Software\${BrandShortName}\TaskBarIDs" "$INSTDIR"
+  DeleteRegValue HKLM "Software\${BrandShortName}\TaskBarIDs" "$INSTDIR"
 
   ClearErrors
   WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
@@ -397,7 +397,7 @@ Section "Uninstall"
   ; subsequently deleted after checking. If the value is found during startup
   ; the browser will offer to Reset Basilisk. We use the UpdateChannel to match
   ; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example.
-  WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "Uninstalled-${UpdateChannel}" "True"
+  WriteRegStr HKCU "Software\${BrandShortName}" "Uninstalled-${UpdateChannel}" "True"
 
   ${un.IsFirewallSvcRunning}
   Pop $0