From c7bea957cbb9278b08a16f0433070519792d7f84 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 6 Jun 2022 00:23:47 -0400 Subject: [PATCH] eliminate extra quote from launchi2p.bat --- makefiles/su.mk | 6 +++--- src/app-profile/version.txt | 2 +- src/nsis/i2pbrowser-jpackage.nsi | 2 +- src/nsis/i2pbrowser-version.nsi | 4 ++-- src/profile/version.txt | 2 +- src/win/launchi2p.bat | 5 +++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/makefiles/su.mk b/makefiles/su.mk index 5d7c2a4..0245ab9 100644 --- a/makefiles/su.mk +++ b/makefiles/su.mk @@ -11,7 +11,7 @@ prepupdate: su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)" - java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER) + java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER) i2pwinupdate.su3.torrent: prepupdate su3 mktorrent \ @@ -22,11 +22,11 @@ i2pwinupdate.su3.torrent: prepupdate su3 torrent: i2pwinupdate.su3.torrent -releases.json: torrent +releases.json: @echo "[" | tee ../i2p.newsxml/data/win/beta/releases.json @echo " {" | tee -a ../i2p.newsxml/data/win/beta/releases.json @echo " \"date\": \"$(I2P_DATE)\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json - @echo " \"version\": \"$(I2P_VERSION)\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json + @echo " \"version\": \"$(PROFILE_VERSION)\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json @echo " \"minVersion\": \"1.5.0\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json @echo " \"minJavaVersion\": \"1.8\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json @echo " \"updates\": {" | tee -a ../i2p.newsxml/data/win/beta/releases.json diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt index 91c74a5..27f9cd3 100644 --- a/src/app-profile/version.txt +++ b/src/app-profile/version.txt @@ -1 +1 @@ -1.7.7 +1.8.0 diff --git a/src/nsis/i2pbrowser-jpackage.nsi b/src/nsis/i2pbrowser-jpackage.nsi index ba0299f..cef7b13 100644 --- a/src/nsis/i2pbrowser-jpackage.nsi +++ b/src/nsis/i2pbrowser-jpackage.nsi @@ -1 +1 @@ -!define I2P_VERSION 1.7.7 +!define I2P_VERSION 1.8.0 diff --git a/src/nsis/i2pbrowser-version.nsi b/src/nsis/i2pbrowser-version.nsi index b0e7325..3fd9cab 100644 --- a/src/nsis/i2pbrowser-version.nsi +++ b/src/nsis/i2pbrowser-version.nsi @@ -1,3 +1,3 @@ !define VERSIONMAJOR 1 -!define VERSIONMINOR 7 -!define VERSIONBUILD 7 +!define VERSIONMINOR 8 +!define VERSIONBUILD 0 diff --git a/src/profile/version.txt b/src/profile/version.txt index 91c74a5..27f9cd3 100644 --- a/src/profile/version.txt +++ b/src/profile/version.txt @@ -1 +1 @@ -1.7.7 +1.8.0 diff --git a/src/win/launchi2p.bat b/src/win/launchi2p.bat index 3d7e966..46eb78b 100644 --- a/src/win/launchi2p.bat +++ b/src/win/launchi2p.bat @@ -3,14 +3,15 @@ SET MYPATH=%~dp0 call "%MYPATH%common.bat" + echo "check if I2P is already running" ::only launch I2P if the proxy is not up on 4444 netstat /o /a /n | findstr "LISTENING" | findstr "7657" >nul 2>nul && ( echo "I2P is already running, not launching" ) || ( echo "I2P is not running, launching" - echo start "i2p" /D "%I2PPath%" i2p.exe - start "i2p" /D "%I2PPath%" i2p.exe + echo start "i2p" /D %I2PPath% i2p.exe + start "i2p" /D %I2PPath% i2p.exe )