Merge branch 'master' into 'settable-paths'

# Conflicts:
#   src/nsis/i2pbrowser-version.nsi
#   src/win/i2pbrowser-private.bat
#   src/win/i2pbrowser.bat

README.md

@@ -21,7 +21,16 @@ To build this, you will need the following software packages (all available in D
 - curl
 - jq
 
-to build a Debian package, you'll also need
+In addition, you will need the NSIS plugin "ShellExecAsUser" which you can get from the
+[NSIS Wiki Page](https://nsis.sourceforge.io/ShellExecAsUser_plug-in). In order to install
+the plugin on Debian, Ubuntu, or using `WSL`, you can download the: [7zip release](https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z)
+and copy the content of `Plugins` to `/usr/share/nsis/Plugins`.
+
+```sh
+cp -rv Plugins/* /usr/share/nsis/Plugins/
+```
+
+To build a Debian package, you'll also need
 
 - checkinstall
 

i2pversion

@@ -11,7 +11,7 @@ VERSION=i2p-"$I2P_VERSION"
 export VERSION="$VERSION"
 
 #Uncomment this to build from the tip of the master.
-#I2P_VERSION=0.9.50
-#export I2P_VERSION=0.9.50
+#I2P_VERSION=1.7.0
+#export I2P_VERSION=1.7.0
 #VERSION=master
 #export VERSION="$VERSION"

src/nsis/i2pbrowser-installer.nsi

@@ -363,6 +363,9 @@ Section "uninstall"
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
     Delete "$SMPROGRAMS\${APPNAME}\Private Browsing-${APPNAME}.lnk"
     Delete "$SMPROGRAMS\Uninstall-${APPNAME}.lnk"
+    Delete "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk"
+    Delete "$DESKTOP\Browse I2P - Temporary Identity.lnk"
+    Delete "$DESKTOP\Browse I2P.lnk"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
     rmDir "$SMPROGRAMS\${APPNAME}"
@@ -390,9 +393,9 @@ Function LaunchLink
   ${If} ${Silent}
     ReadEnvStr $0 RESTART_I2P
     ${If} $0 != ""
-      Exec "$I2PINSTEXE\I2P.exe"
+      ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
     ${EndIf}  
   ${Else}
-    Exec "$I2PINSTEXE\I2P.exe"
+    ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
   ${EndIf}
 FunctionEnd

src/win/i2pbrowser.bat

@@ -21,6 +21,9 @@ if exist "%I2PPath%\jpackaged" (
   start "i2p" "%I2PPath%\i2p.exe"
 )
 
+
+
+
 timeout /t 3
 
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (