From 6faaab1f447d607fa10c75836f19475e35fced2e Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 14 Sep 2022 16:47:00 -0400
Subject: [PATCH] delete a couple of redundant files

---
 src/app-profile/version.txt       |  2 +-
 src/nsis/i2pbrowser-installer.nsi |  2 -
 src/nsis/i2pbrowser-jpackage.nsi  |  2 +-
 src/nsis/i2pbrowser-mozcompat.nsi | 37 ----------------
 src/nsis/i2pbrowser-strrep.nsh    | 71 -------------------------------
 src/nsis/i2pbrowser-version.nsi   |  2 +-
 src/profile/version.txt           |  2 +-
 7 files changed, 4 insertions(+), 114 deletions(-)
 delete mode 100644 src/nsis/i2pbrowser-mozcompat.nsi
 delete mode 100644 src/nsis/i2pbrowser-strrep.nsh

diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt
index 158c747..7bc1c40 100644
--- a/src/app-profile/version.txt
+++ b/src/app-profile/version.txt
@@ -1 +1 @@
-1.9.5
+1.9.6
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index 84c8128..1bf94a7 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -128,8 +128,6 @@ PageEx directory
 PageExEnd
 Page instfiles
 
-#!include i2pbrowser-mozcompat.nsi
-
 Function .onInit
     StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
     UserInfo::GetAccountType
diff --git a/src/nsis/i2pbrowser-jpackage.nsi b/src/nsis/i2pbrowser-jpackage.nsi
index 10e908d..5c83478 100644
--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@@ -1 +1 @@
-!define I2P_VERSION 1.9.5
+!define I2P_VERSION 1.9.6
diff --git a/src/nsis/i2pbrowser-mozcompat.nsi b/src/nsis/i2pbrowser-mozcompat.nsi
deleted file mode 100644
index 0be8f16..0000000
--- a/src/nsis/i2pbrowser-mozcompat.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-; Returns 1 in $0 if we should install the 64-bit build, or 0 if not.
-; The requirements for selecting the 64-bit build to install are:
-; 1) Running a 64-bit OS (we've already checked the OS version).
-; 2) An amount of RAM strictly greater than RAM_NEEDED_FOR_64BIT
-; 3) No third-party products installed that cause issues with the 64-bit build.
-;    Currently this includes Lenovo OneKey Theater and Lenovo Energy Management.
-Function ShouldInstall64Bit
-    StrCpy $0 0
-
-    ${IfNot} ${RunningX64}
-    Return
-    ${EndIf}
-
-    System::Call "*(i 64, i, l 0, l, l, l, l, l, l)p.r1"
-    System::Call "Kernel32::GlobalMemoryStatusEx(p r1)"
-    System::Call "*$1(i, i, l.r2, l, l, l, l, l, l)"
-    System::Free $1
-    ${If} $2 L<= ${RAM_NEEDED_FOR_64BIT}
-    Return
-    ${EndIf}
-
-    ; Lenovo OneKey Theater can theoretically be in a directory other than this
-    ; one, because some installer versions let you change it, but it's unlikely.
-    ${If} ${FileExists} "$PROGRAMFILES32\Lenovo\Onekey Theater\windowsapihookdll64.dll"
-    Return
-    ${EndIf}
-
-    ${If} ${FileExists} "$PROGRAMFILES32\Lenovo\Energy Management\Energy Management.exe"
-    Return
-    ${EndIf}
-
-    StrCpy $0 1
-FunctionEnd
diff --git a/src/nsis/i2pbrowser-strrep.nsh b/src/nsis/i2pbrowser-strrep.nsh
deleted file mode 100644
index 8f76138..0000000
--- a/src/nsis/i2pbrowser-strrep.nsh
+++ /dev/null
@@ -1,71 +0,0 @@
-
-;;
-;; TODO: Examine licensing for this function.
-;;https://nsis.sourceforge.io/StrRep
-
-!define StrRep "!insertmacro StrRep"
-!macro StrRep output string old new
-    Push `${string}`
-    Push `${old}`
-    Push `${new}`
-    !ifdef __UNINSTALL__
-        Call un.StrRep
-    !else
-        Call StrRep
-    !endif
-    Pop ${output}
-!macroend
-
-!macro Func_StrRep un
-    Function ${un}StrRep
-        Exch $R2 ;new
-        Exch 1
-        Exch $R1 ;old
-        Exch 2
-        Exch $R0 ;string
-        Push $R3
-        Push $R4
-        Push $R5
-        Push $R6
-        Push $R7
-        Push $R8
-        Push $R9
-
-        StrCpy $R3 0
-        StrLen $R4 $R1
-        StrLen $R6 $R0
-        StrLen $R9 $R2
-        loop:
-            StrCpy $R5 $R0 $R4 $R3
-            StrCmp $R5 $R1 found
-            StrCmp $R3 $R6 done
-            IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character
-            Goto loop
-        found:
-            StrCpy $R5 $R0 $R3
-            IntOp $R8 $R3 + $R4
-            StrCpy $R7 $R0 "" $R8
-            StrCpy $R0 $R5$R2$R7
-            StrLen $R6 $R0
-            IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string
-            Goto loop
-        done:
-
-        Pop $R9
-        Pop $R8
-        Pop $R7
-        Pop $R6
-        Pop $R5
-        Pop $R4
-        Pop $R3
-        Push $R0
-        Push $R1
-        Pop $R0
-        Pop $R1
-        Pop $R0
-        Pop $R2
-        Exch $R1
-    FunctionEnd
-!macroend
-!insertmacro Func_StrRep ""
-!insertmacro Func_StrRep "un."
diff --git a/src/nsis/i2pbrowser-version.nsi b/src/nsis/i2pbrowser-version.nsi
index 294e751..f2457cd 100644
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 9
-!define VERSIONBUILD 5
+!define VERSIONBUILD 6
diff --git a/src/profile/version.txt b/src/profile/version.txt
index 158c747..7bc1c40 100644
--- a/src/profile/version.txt
+++ b/src/profile/version.txt
@@ -1 +1 @@
-1.9.5
+1.9.6