call common.bat on every script that requires variables set in that script

2022-05-08 13:06:18 -04:00
parent 978af1cb11
commit ec98865d33
7 changed files with 12 additions and 3 deletions
--- a/src/win/common.bat
+++ b/src/win/common.bat
@@ -1,4 +1,7 @@

+SET MYPATH=%~dp0
+call %MYPATH%common.bat
+
 set "I2PPath=%ProgramFiles%\I2P\"
 if exist "%LocalAppData%\I2P\I2P.exe" (
  set "I2PPath=%LocalAppData%\I2P\"
--- a/src/win/copy-config-profile.bat
+++ b/src/win/copy-config-profile.bat
@@ -1,4 +1,7 @@

+SET MYPATH=%~dp0
+call %MYPATH%common.bat
+
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\" (
  echo "profile is configured"
  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.config.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\extensions"
--- a/src/win/copy-profile.bat
+++ b/src/win/copy-profile.bat
@@ -1,4 +1,7 @@

+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 "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
--- a/src/win/i2pbrowser-private.bat
+++ b/src/win/i2pbrowser-private.bat
@@ -1,7 +1,6 @@
@echo on

 SET MYPATH=%~dp0
-
 call %MYPATH%common.bat

 call %MYPATH%launchi2p.bat
--- a/src/win/i2pbrowser.bat
+++ b/src/win/i2pbrowser.bat
@@ -1,7 +1,6 @@
@echo on

 SET MYPATH=%~dp0
-
 call %MYPATH%common.bat

 call %MYPATH%launchi2p.bat
--- a/src/win/i2pconfig.bat
+++ b/src/win/i2pconfig.bat
@@ -1,7 +1,6 @@
@echo on

 SET MYPATH=%~dp0
-
 call %MYPATH%common.bat

 call %MYPATH%copy-config-profile.bat
--- a/src/win/launchi2p.bat
+++ b/src/win/launchi2p.bat
@@ -1,4 +1,7 @@

+SET MYPATH=%~dp0
+call %MYPATH%common.bat
+
 if exist "%I2PPath%\jpackaged" (
  cd "%LOCALAPPDATA%\I2P"
  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"