Skip to content

Commit 2e936f9

Browse files
committed
feat(remove): Remove prepacked bins for linux
Signed-off-by: dark0dave <[email protected]>
1 parent d17ce53 commit 2e936f9

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
lines changed

EET/EET.tp2

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,27 @@ ACTION_IF ~%SYSTEM_ARCH%~ STR_EQ ~amd64~ BEGIN
196196
OUTER_SPRINT arch_var ~x86_64%os_slash%~
197197
END
198198
PRINT ~arch_var = %arch_var%~
199+
199200
ACTION_FOR_EACH file IN lua weidu BEGIN
200201
ACTION_IF FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%arch_var%%file%%exe%~ BEGIN
201202
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%%file%%exe%~
202203
END ELSE ACTION_IF (NOT ~%arch_var%~ STR_EQ ~~) AND (FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%file%%exe%~) BEGIN
203204
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%file%%exe%~
204205
END ELSE BEGIN
205-
FAIL ~%file% not found~
206+
ACTION_IF (~%WEIDU_OS%~ STR_EQ ~unix~) BEGIN
207+
OUTER_SPRINT shell_cmd ~which %file%~
208+
AT_NOW ret_val ~%shell_cmd%~ EXACT
209+
ACTION_IF (ret_val != 0) BEGIN
210+
WARN ~Shell command failed to execute: %shell_cmd%~
211+
FAIL ~%file% not found, you'll need to add %file% to your path~
212+
END
213+
OUTER_SPRINT EVAL ~%file%~ ~%file%~
214+
END ELSE BEGIN
215+
FAIL ~%file% not found~
216+
END
206217
END
207218
OUTER_SPRINT tool EVAL ~%%file%%~
208-
ACTION_IF NOT ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
219+
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN
209220
OUTER_SPRINT shell_cmd ~chmod +x %tool%~
210221
AT_NOW ret_val ~%shell_cmd%~ EXACT
211222
ACTION_IF (ret_val != 0) BEGIN
@@ -2772,6 +2783,8 @@ ACTION_FOR_EACH file IN EET_end EET_gui BEGIN
27722783
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~osx~ BEGIN
27732784
COPY ~setup-EET.command~ ~setup-%file%.command~
27742785
REPLACE_TEXTUALLY ~EET/EET.tp2 --log SETUP-EET.DEBUG~ ~%file%/%file%.tp2 --log SETUP-%file%.DEBUG~
2786+
END ELSE ACTION_IF ~%WEIDU_OS%~ STR_EQ ~unix~ BEGIN
2787+
PRINT ~noop~
27752788
END ELSE BEGIN
27762789
COPY ~%weidu%~ ~setup-%file%%exe%~
27772790
END

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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
22

33
#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
4+
weidu --noautoupdate --no-auto-tp2 --logapp --out "bgee.tra" --use-lang "en_us" --traify-tlk
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
22

33
#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
4+
weidu --noautoupdate --no-auto-tp2 --logapp --out "bgee.tra" --use-lang "pl_pl" --traify-tlk

EET_end/EET_end.tp2

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,14 @@ 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 ACTION_IF (~%WEIDU_OS%~ STR_EQ ~unix~) BEGIN
795+
OUTER_SPRINT shell_cmd ~which weidu~
796+
AT_NOW ret_val ~%shell_cmd%~ EXACT
797+
ACTION_IF (ret_val == "") BEGIN
798+
WARN ~Shell command failed to execute: %shell_cmd%~
799+
FAIL ~weidu not found, you'll need to add weidu to your path~
800+
END
801+
OUTER_SPRINT EVAL ~weidu~ ~weidu~
794802
END
795803
PRINT ~weidu = %weidu%~
796804

@@ -799,13 +807,7 @@ AT_NOW ret_val ~%shell_cmd%~ EXACT
799807
ACTION_IF (ret_val != 0) BEGIN
800808
WARN ~Shell command failed to execute: %shell_cmd%~
801809
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
810+
809811
OUTER_SPRINT shell_cmd ~%weidu% --noautoupdate --no-auto-tp2 --traify-tlk --min %str_min% --out "%USER_DIRECTORY%%os_slash%save%os_slash%saves.tra"~
810812
AT_NOW ret_val ~%shell_cmd%~ EXACT
811813
ACTION_IF (ret_val != 0) BEGIN

0 commit comments

Comments
 (0)