From 58dbf0319680dec0ce42a7a7d3890872c890bada Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Mon, 20 Dec 2021 00:13:49 +0530
Subject: [PATCH] i2p: Use portable version as default

---
 bucket/i2p.json                               | 14 +++++++++++--
 .../i2p-portable.json => deprecated/i2p.json  | 20 ++++++++-----------
 2 files changed, 20 insertions(+), 14 deletions(-)
 rename bucket/i2p-portable.json => deprecated/i2p.json (72%)

diff --git a/bucket/i2p.json b/bucket/i2p.json
index 88505bb3d7..9b25bcd792 100644
--- a/bucket/i2p.json
+++ b/bucket/i2p.json
@@ -24,11 +24,12 @@
         ],
         [
             "I2Psvc.exe",
-            "I2P\\Start I2P (restartable)",
+            "Start I2P",
             "-c \"$dir\\wrapper.config\"",
             "docs\\start.ico"
         ]
     ],
+    "persist": "i2p",
     "installer": {
         "script": [
             "$temp = \"$env:TEMP\\I2P\"",
@@ -36,7 +37,16 @@
             "Move-Item \"$dir\\install.jar\" \"$temp\\install.jar\" -Force",
             "New-Item -Path $temp -Name 'install.defaults' -Value \"INSTALL_PATH=$($dir.toString().Replace('\\', '/'))\" -Force | Out-Null",
             "& (scoop which java) -jar \"$temp\\install.jar\" -auto | Out-Null",
-            "Remove-Item $temp -Force -Recurse"
+            "Remove-Item $temp -Force -Recurse",
+            "$content = @(",
+            "    'wrapper.java.additional.3=-Di2p.dir.pid=./i2p'",
+            "    'wrapper.java.additional.4=-Di2p.dir.temp=./i2p'",
+            "    'wrapper.java.additional.5=-Di2p.dir.config=./i2p'",
+            "    'wrapper.logfile=./i2p/wrapper.log'",
+            "    'wrapper.java.pidfile=./i2p/routerjvm.pid'",
+            "    'wrapper.pidfile=./i2p/i2p.pid'",
+            ")",
+            "Add-Content \"$dir\\wrapper.config\" $content -Encoding UTF8"
         ]
     },
     "checkver": {
diff --git a/bucket/i2p-portable.json b/deprecated/i2p.json
similarity index 72%
rename from bucket/i2p-portable.json
rename to deprecated/i2p.json
index cdd133c2c7..88505bb3d7 100644
--- a/bucket/i2p-portable.json
+++ b/deprecated/i2p.json
@@ -16,14 +16,19 @@
         "I2Psvc.exe"
     ],
     "shortcuts": [
+        [
+            "I2P.exe",
+            "I2P\\Start I2P (no window)",
+            "",
+            "docs\\start.ico"
+        ],
         [
             "I2Psvc.exe",
-            "Start I2P",
+            "I2P\\Start I2P (restartable)",
             "-c \"$dir\\wrapper.config\"",
             "docs\\start.ico"
         ]
     ],
-    "persist": "i2p",
     "installer": {
         "script": [
             "$temp = \"$env:TEMP\\I2P\"",
@@ -31,16 +36,7 @@
             "Move-Item \"$dir\\install.jar\" \"$temp\\install.jar\" -Force",
             "New-Item -Path $temp -Name 'install.defaults' -Value \"INSTALL_PATH=$($dir.toString().Replace('\\', '/'))\" -Force | Out-Null",
             "& (scoop which java) -jar \"$temp\\install.jar\" -auto | Out-Null",
-            "Remove-Item $temp -Force -Recurse",
-            "$content = @(",
-            "    'wrapper.java.additional.3=-Di2p.dir.pid=./i2p'",
-            "    'wrapper.java.additional.4=-Di2p.dir.temp=./i2p'",
-            "    'wrapper.java.additional.5=-Di2p.dir.config=./i2p'",
-            "    'wrapper.logfile=./i2p/wrapper.log'",
-            "    'wrapper.java.pidfile=./i2p/routerjvm.pid'",
-            "    'wrapper.pidfile=./i2p/i2p.pid'",
-            ")",
-            "Add-Content \"$dir\\wrapper.config\" $content -Encoding UTF8"
+            "Remove-Item $temp -Force -Recurse"
         ]
     },
     "checkver": {