From eafa1bf04d698eae1df4358c05fa6c6de0ddae53 Mon Sep 17 00:00:00 2001 From: idk Date: Fri, 19 Aug 2022 13:02:57 -0400 Subject: [PATCH] remove the bat files from the final product --- makefiles/build.mk | 14 +++++++------- src/nsis/i2pbrowser-installer.nsi | 4 ++-- src/win/common.bat | 18 ------------------ src/win/copy-config-profile.bat | 12 ------------ src/win/copy-profile.bat | 12 ------------ src/win/i2pbrowser-private.bat | 27 --------------------------- src/win/i2pbrowser.bat | 27 --------------------------- src/win/i2pconfig.bat | 23 ----------------------- src/win/launchi2p.bat | 17 ----------------- src/win/test.bat | 8 -------- 10 files changed, 9 insertions(+), 153 deletions(-) delete mode 100644 src/win/common.bat delete mode 100644 src/win/copy-config-profile.bat delete mode 100644 src/win/copy-profile.bat delete mode 100644 src/win/i2pbrowser-private.bat delete mode 100644 src/win/i2pbrowser.bat delete mode 100644 src/win/i2pconfig.bat delete mode 100644 src/win/launchi2p.bat delete mode 100644 src/win/test.bat diff --git a/makefiles/build.mk b/makefiles/build.mk index 4d4a339..a173198 100644 --- a/makefiles/build.mk +++ b/makefiles/build.mk @@ -8,25 +8,25 @@ build/win: mkdir -p build/win/ build/win/common.bat: - cp src/win/common.bat build/win/common.bat + #cp src/win/common.bat build/win/common.bat build/win/copy-config-profile.bat: - cp src/win/copy-config-profile.bat build/win/copy-config-profile.bat + #cp src/win/copy-config-profile.bat build/win/copy-config-profile.bat build/win/copy-profile.bat: - cp src/win/launchi2p.bat build/win/copy-profile.bat + #cp src/win/launchi2p.bat build/win/copy-profile.bat build/win/launchi2p.bat: - cp src/win/launchi2p.bat build/win/launchi2p.bat + #cp src/win/launchi2p.bat build/win/launchi2p.bat build/win/i2pbrowser.bat: build/win/common.bat build/win/copy-config-profile.bat build/win/copy-profile.bat build/win/launchi2p.bat - cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat + #cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat build/win/i2pconfig.bat: build/win/common.bat build/win/copy-config-profile.bat build/win/copy-profile.bat build/win/launchi2p.bat - cp src/win/i2pconfig.bat build/win/i2pconfig.bat + #cp src/win/i2pconfig.bat build/win/i2pconfig.bat build/win/i2pbrowser-private.bat: build/win/common.bat build/win/copy-config-profile.bat build/win/copy-profile.bat build/win/launchi2p.bat - cp src/win/i2pbrowser-private.bat build/win/i2pbrowser-private.bat + #cp src/win/i2pbrowser-private.bat build/win/i2pbrowser-private.bat launchers: build/win build/win/i2pbrowser.bat build/win/i2pbrowser-private.bat build/win/i2pconfig.bat diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi index a835730..d4aa98f 100644 --- a/src/nsis/i2pbrowser-installer.nsi +++ b/src/nsis/i2pbrowser-installer.nsi @@ -262,8 +262,8 @@ ${If} ${Silent} # Install the launcher scripts createDirectory "$INSTDIR" - SetOutPath "$INSTDIR" - File "win/*" + #SetOutPath "$INSTDIR" + #File "win/*" # Install the licenses createDirectory "$INSTDIR\licenses" diff --git a/src/win/common.bat b/src/win/common.bat deleted file mode 100644 index 421ac67..0000000 --- a/src/win/common.bat +++ /dev/null @@ -1,18 +0,0 @@ -@echo off - -SET "MYPATH=%~dp0" - -set ProgramFiles64=%ProgramFiles: (x86)=% -set "I2PData=%LocalAppData%\I2P\" - -if exist "%LocalAppData%\I2P\I2P.exe" ( - set "I2PPath=%LocalAppData%\I2P\" -) - -if exist "%ProgramFiles64%\I2P\I2P.exe" ( - set "I2PPath=%ProgramFiles64%\I2P\" -) - -if exist "%ProgramFiles(x86)%\I2P\I2P.exe" ( - set "I2PPath=%ProgramFiles(x86)%\I2P\" -) diff --git a/src/win/copy-config-profile.bat b/src/win/copy-config-profile.bat deleted file mode 100644 index c998d16..0000000 --- a/src/win/copy-config-profile.bat +++ /dev/null @@ -1,12 +0,0 @@ - -SET "MYPATH=%~dp0" -call "%MYPATH%common.bat" - -if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\" ( - echo "profile is configured" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\extensions" -) else ( - echo "configuring profile" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -) - -xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\user.js*" -xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\prefs.js*" diff --git a/src/win/copy-profile.bat b/src/win/copy-profile.bat deleted file mode 100644 index 1c21b20..0000000 --- a/src/win/copy-profile.bat +++ /dev/null @@ -1,12 +0,0 @@ - -SET "MYPATH=%~dp0" -call "%MYPATH%common.bat" - -if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" ( - echo "profile is configured, updating extensions" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions" -) else ( - echo "configuring profile" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -) - -xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\user.js*" -xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\prefs.js*" diff --git a/src/win/i2pbrowser-private.bat b/src/win/i2pbrowser-private.bat deleted file mode 100644 index 22f16b2..0000000 --- a/src/win/i2pbrowser-private.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo on - -SET "MYPATH=%~dp0" -call "%MYPATH%common.bat" - -call "%MYPATH%launchi2p.bat" - -call "%MYPATH%copy-profile.bat" - -timeout /t 3 - -if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" ( - start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank - exit -) - -if exist "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" ( - start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank - exit -) - -if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" ( - start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank - exit -) - -exit diff --git a/src/win/i2pbrowser.bat b/src/win/i2pbrowser.bat deleted file mode 100644 index 529aff6..0000000 --- a/src/win/i2pbrowser.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo on - -SET "MYPATH=%~dp0" -call "%MYPATH%common.bat" - -call "%MYPATH%launchi2p.bat" - -call "%MYPATH%copy-profile.bat" - -timeout /t 3 - -if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" ( - start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -url %1 - exit -) - -if exist "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" ( - start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -url %1 - exit -) - -if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" ( - start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -url %1 - exit -) - -exit diff --git a/src/win/i2pconfig.bat b/src/win/i2pconfig.bat deleted file mode 100644 index b7b6f3f..0000000 --- a/src/win/i2pconfig.bat +++ /dev/null @@ -1,23 +0,0 @@ -@echo off - -SET "MYPATH=%~dp0" -call "%MYPATH%common.bat" - -call "%MYPATH%copy-config-profile.bat" - -if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" ( - start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1 - exit -) - -if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" ( - start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1 - exit -) - -if exist "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" ( - start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1 - exit -) - -exit diff --git a/src/win/launchi2p.bat b/src/win/launchi2p.bat deleted file mode 100644 index 8555578..0000000 --- a/src/win/launchi2p.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo on - -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 -) - - diff --git a/src/win/test.bat b/src/win/test.bat deleted file mode 100644 index c8e9be4..0000000 --- a/src/win/test.bat +++ /dev/null @@ -1,8 +0,0 @@ - -SET "MYPATH=%~dp0" - -call "%MYPATH%common.bat" - -set TEST=TEST - -echo testing: %TEST% path to me: %MYPATH% path to I2P %I2PPath%