Skip to content

Commit 484363d

Browse files
committed
fix(bins): BINS BEGONE
Signed-off-by: dark0dave <dark0dave@mykolab.com>
1 parent b164f59 commit 484363d

11 files changed

Lines changed: 61 additions & 44 deletions

File tree

‎EET/EET.tp2‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ AUTHOR ~K4thos (swit)~
33
VERSION ~v14.0~
44
README ~EET/lang/%LANGUAGE%/readme-EET.html~ ~EET/readme-EET.html~
55

6+
ALWAYS
7+
ACTION_IF NOT ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
8+
ACTION_FOR_EACH file IN lua weidu BEGIN
9+
OUTER_SPRINT shell_cmd ~which %file%~
10+
AT_NOW ret_val ~%shell_cmd%~
11+
ACTION_IF (ret_val != 0) BEGIN
12+
FAIL ~%file% not on path, please add %file% to path~
13+
END
14+
OUTER_SPRINT EVAL ~%file%~ ~%file%~
15+
PRINT ~%file% assigned to %file%~
16+
END
17+
END
18+
END
19+
620
LANGUAGE ~English~
721
~en_US~
822
~EET/lang/en_US/prompts.tra~
@@ -191,28 +205,21 @@ END ELSE BEGIN
191205
COPY ~.../blank.txt~ ~WeiDU-BGEE.log~
192206
END
193207

194-
LAF GET_SYSTEM_ARCH RET SYSTEM_ARCH END
195-
ACTION_IF ~%SYSTEM_ARCH%~ STR_EQ ~amd64~ BEGIN
196-
OUTER_SPRINT arch_var ~x86_64%os_slash%~
197-
END
198-
PRINT ~arch_var = %arch_var%~
199-
ACTION_FOR_EACH file IN lua weidu BEGIN
200-
ACTION_IF FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%arch_var%%file%%exe%~ BEGIN
201-
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%%file%%exe%~
202-
END ELSE ACTION_IF (NOT ~%arch_var%~ STR_EQ ~~) AND (FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%file%%exe%~) BEGIN
203-
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%file%%exe%~
204-
END ELSE BEGIN
205-
FAIL ~%file% not found~
206-
END
207-
OUTER_SPRINT tool EVAL ~%%file%%~
208-
ACTION_IF NOT ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
209-
OUTER_SPRINT shell_cmd ~chmod +x %tool%~
210-
AT_NOW ret_val ~%shell_cmd%~ EXACT
211-
ACTION_IF (ret_val != 0) BEGIN
212-
WARN ~Shell command failed to execute: %shell_cmd%~
208+
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
209+
LAF GET_SYSTEM_ARCH RET SYSTEM_ARCH END
210+
ACTION_IF ~%SYSTEM_ARCH%~ STR_EQ ~amd64~ BEGIN
211+
OUTER_SPRINT arch_var ~x86_64%os_slash%~
212+
END
213+
PRINT ~arch_var = %arch_var%~
214+
ACTION_FOR_EACH file IN lua weidu BEGIN
215+
ACTION_IF FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%arch_var%%file%%exe%~ BEGIN
216+
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%%file%%exe%~
217+
END ELSE ACTION_IF (NOT ~%arch_var%~ STR_EQ ~~) AND (FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%file%%exe%~) BEGIN
218+
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%file%%exe%~
213219
END
220+
OUTER_SPRINT tool EVAL ~%%file%%~
221+
PRINT ~%file% assigned to %tool%~
214222
END
215-
PRINT ~%file% assigned to %tool%~
216223
END
217224

218225
///// \\\\\
@@ -271,12 +278,14 @@ ACTION_IF NOT ~%log%~ STR_EQ ~~ BEGIN
271278
END
272279

273280
OUTER_SPRINT shell_cmd ~%weidu% --noautoupdate --no-auto-tp2 --logapp --log "%MOD_FOLDER%/temp/bash.debug" --game "%bgee_dir%" --use-lang "%LANGUAGE_BG1%" --traify# 200000 --traify-tlk --out "%MOD_FOLDER%/temp/bgee.tra"~
281+
PRINT ~%shell_cmd%~
274282
AT_NOW ret_val ~%shell_cmd%~
275283
ACTION_IF (ret_val != 0) BEGIN
276284
WARN ~Shell command failed to execute: %shell_cmd%~
277285
END
278286

279287
OUTER_SPRINT shell_cmd ~%lua% %MOD_FOLDER%/lib/tlk_cnt.lua~
288+
PRINT ~%shell_cmd%~
280289
AT_NOW ret_val ~%shell_cmd%~
281290
ACTION_IF (ret_val != 0) BEGIN
282291
WARN ~Shell command failed to execute: %shell_cmd%~
@@ -2766,18 +2775,15 @@ COPY ~.../blank.txt~ ~override/EET.flag~
27662775
APPEND ~EET.flag~ ~EET_JOURNAL~
27672776
PRINT ~'EET.flag' file is used by WeiDU to recognize the installation as EET~
27682777

2769-
27702778
ACTION_FOR_EACH file IN EET_end EET_gui BEGIN
2771-
//COPY + ~%MOD_FOLDER%/lib/%file%.tp2~ ~%file%.tp2~
2772-
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN
2779+
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN
27732780
COPY ~setup-EET.command~ ~setup-%file%.command~
27742781
REPLACE_TEXTUALLY ~EET/EET.tp2 --log SETUP-EET.DEBUG~ ~%file%/%file%.tp2 --log SETUP-%file%.DEBUG~
2775-
END ELSE BEGIN
2782+
END ELSE ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
27762783
COPY ~%weidu%~ ~setup-%file%%exe%~
27772784
END
27782785
END
27792786

2780-
27812787
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
27822788
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
27832789
///// \\\\\
@@ -2795,7 +2801,7 @@ DESIGNATED 100
27952801
ACTION_IF (~%WEIDU_OS%~ STR_EQ ~win32~) BEGIN
27962802
INCLUDE ~%MOD_FOLDER%/lib/shortcut_windows.tph~
27972803
END ELSE ACTION_IF (~%WEIDU_OS%~ STR_EQ ~unix~) BEGIN
2798-
INCLUDE ~%MOD_FOLDER%/lib/shortcut_linux.tph~
2804+
INCLUDE ~%MOD_FOLDER%/lib/shortcut_linux.tph~
27992805
END ELSE BEGIN
28002806
WARN ~WARNING: Shortcut creation not available for "%WEIDU_OS%"~
28012807
END

‎EET/bin/osx/lua‎

-219 KB
Binary file not shown.

‎EET/bin/osx/x86_64/weidu‎

-7.58 MB
Binary file not shown.

‎EET/bin/unix/lua‎

-1000 KB
Binary file not shown.

‎EET/bin/unix/x86_64/lua‎

-1.79 MB
Binary file not shown.

‎EET/bin/unix/x86_64/weidu‎

-1.13 MB
Binary file not shown.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
1+
#!/usr/bin/env sh
22

3-
#this is meant to be run in ee/other/--traify-tlk/
4-
cd .. && cd .. && chmod 755 eet/weidu
5-
./eet/weidu --noautoupdate --no-auto-tp2 --logapp --out "bgee.tra" --use-lang "en_us" --traify-tlk
3+
weidu --noautoupdate --no-auto-tp2 --logapp --out "bgee.tra" --use-lang "en_us" --traify-tlk
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
1+
#!/usr/bin/env sh
22

3-
#this is meant to be run in ee/other/--traify-tlk/
4-
cd .. && cd .. && chmod 755 eet/weidu
5-
./eet/weidu --noautoupdate --no-auto-tp2 --logapp --out "bgee.tra" --use-lang "pl_pl" --traify-tlk
3+
weidu --noautoupdate --no-auto-tp2 --logapp --out "bgee.tra" --use-lang "pl_pl" --traify-tlk

‎EET_end/EET_end.tp2‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,8 @@ END ELSE ACTION_IF (FILE_EXISTS ~EET/bin/%WEIDU_OS%/weidu%exe%~) BEGIN
791791
OUTER_SPRINT weidu ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%weidu%exe%~
792792
END ELSE ACTION_IF (FILE_EXISTS ~setup-eet_end%exe%~) BEGIN
793793
OUTER_SPRINT weidu ~%bin%setup-eet_end%exe%~
794+
END ELSE BEGIN
795+
OUTER_SPRINT weidu ~weidu~
794796
END
795797
PRINT ~weidu = %weidu%~
796798

@@ -799,13 +801,7 @@ AT_NOW ret_val ~%shell_cmd%~ EXACT
799801
ACTION_IF (ret_val != 0) BEGIN
800802
WARN ~Shell command failed to execute: %shell_cmd%~
801803
END
802-
ACTION_IF (NOT ~%WEIDU_OS%~ STR_EQ ~win32~) BEGIN
803-
OUTER_SPRINT shell_cmd ~chmod +x %weidu%~
804-
AT_NOW ret_val ~%shell_cmd%~ EXACT
805-
ACTION_IF (ret_val != 0) BEGIN
806-
WARN ~Shell command failed to execute: %shell_cmd%~
807-
END
808-
END
804+
809805
OUTER_SPRINT shell_cmd ~%weidu% --noautoupdate --no-auto-tp2 --traify-tlk --min %str_min% --out "%USER_DIRECTORY%%os_slash%save%os_slash%saves.tra"~
810806
AT_NOW ret_val ~%shell_cmd%~ EXACT
811807
ACTION_IF (ret_val != 0) BEGIN

‎README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,26 @@ II. Become a mod-friendly platform with the additional modding possibilities tha
2525
- Intuitive conventions for renamed BG:EE files and modders resources that can be used for adopting existing mods.
2626
- Limited support for mods installed on BG:EE previous to installing EET on BG2:EE.
2727

28+
## Requirements for Linux and Macos Users
29+
30+
- A recent version of weidu (anything newer than v248, will do fine) on your path, you likely already have this if you have install mods before. If not here is a short example on how to add weidu to your path:
31+
```bash
32+
export PATH="${PATH}:<path to weidu>"
33+
```
34+
where `<path to weidu>` is the folder containing your weidu binary, If you do not have weidu locally you can fetch it from github.
35+
36+
- A recent version of Lua (bundled for windws is 5.3 Lua), your package manager's version should work as should homebrew/macports for macos. You can check the version of Lua you have on your path with, the following:
37+
38+
```bash
39+
lua -v
40+
```
41+
42+
you should see something like:
43+
44+
```bash
45+
Lua 5.4.8 Copyright (C) 1994-2025 Lua.org, PUC-Rio
46+
```
47+
2848
## More Information
2949

3050
:page_facing_up: [Project Page](https://www.gibberlings3.net/mods/other/eet/)

0 commit comments

Comments
 (0)