From 28ad8fcb610ad118b00a07354de894dcd012220b Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 18 May 2022 13:43:47 -0400
Subject: [PATCH] disable elevator callback

---
 src/nsis/i2pbrowser-installer.nsi | 34 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index c0c93bb..2d82034 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -130,7 +130,7 @@ RequestExecutionLevel user
 PageEx license
     licensetext "${LICENSE_TITLE}"
     licensedata "licenses\LICENSE.index"
-    PageCallbacks elevatorCallback
+    #PageCallbacks elevatorCallback
 PageExEnd
 PageEx directory
     dirtext "${FIREFOX_MESSAGE}"
@@ -348,10 +348,10 @@ Function elevatorCallback
     ${EndIf}
     ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
         ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"
-        Quit
+        #Quit
     ${ElseIf} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
         ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"
-        Quit
+        #Quit
     ${EndIf}
 FunctionEnd
 
@@ -363,15 +363,14 @@ SectionEnd
 
 # uninstaller section start
 Section "uninstall"
-
-    # Remove the licenses
-    rmDir /r "$INSTDIR\"
-
     # Uninstall the launcher scripts
-    Delete $INSTDIR\i2pbrowser.bat
-    Delete $INSTDIR\i2pconfig.bat
-    Delete $INSTDIR\i2pbrowser-private.bat
-    Delete $INSTDIR\ui2pbrowser_icon.ico
+    Delete $INSTDIR\*
+    rmDir /r "$INSTDIR\"
+    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+        Delete $I2PINSTEXE\*
+        rmDir /r "$I2PINSTEXE"
+    ${EndIf}
+    
 
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
@@ -382,15 +381,12 @@ Section "uninstall"
     Delete "$DESKTOP\Browse I2P.lnk"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
-    rmDir "$SMPROGRAMS\${APPNAME}"
-    rmDir "$INSTDIR\firefox.profile.i2p\extensions"
-    rmDir "$INSTDIR\firefox.profile.i2p"
-    rmDir "$LOCALAPPDATA\${APPNAME}"
-    rmDir "$INSTDIR"
+    rmDir /r "$SMPROGRAMS\${APPNAME}"
+    rmDir /r "$INSTDIR\firefox.profile.i2p\extensions"
+    rmDir /r "$INSTDIR\firefox.profile.i2p"
+    rmDir /r "$LOCALAPPDATA\${APPNAME}"
+    rmDir /r "$INSTDIR"
     
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
-        rmDir "$I2PINSTEXE"
-    ${EndIf}
     # delete the uninstaller
     Delete "$INSTDIR\uninstall-i2pbrowser.exe"