Skip to content

Commit 081136c

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

File tree

9 files changed

+17
-30
lines changed

9 files changed

+17
-30
lines changed

EET/EET.tp2

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ ACTION_IF (DIRECTORY_EXISTS ~%MOD_FOLDER%/temp~) BEGIN
111111
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
112112
OUTER_SPRINT shell_cmd ~rmdir /s /q %MOD_FOLDER%\temp~
113113
END ELSE BEGIN //osx, unix
114-
OUTER_SPRINT shell_cmd ~rm -rf %MOD_FOLDER%/temp~
114+
// OUTER_SPRINT shell_cmd ~rm -rf %MOD_FOLDER%/temp~
115115
END
116116
AT_NOW ret_val ~%shell_cmd%~ EXACT
117117
ACTION_IF (ret_val != 0) BEGIN
@@ -163,7 +163,7 @@ END ELSE BEGIN //osx, unix
163163
OUTER_SPRINT bin ~./~
164164
OUTER_SPRINT bash_debug ~ 2>>%MOD_FOLDER%/temp/bash.debug | tee -a %MOD_FOLDER%/temp/bash.debug~
165165
ACTION_IF (~%argv[0]%~ STRING_CONTAINS_REGEXP ~[dD]~ = 1) BEGIN
166-
AT_EXIT ~rm -rf %MOD_FOLDER%/temp~ EXACT
166+
//AT_EXIT ~rm -rf %MOD_FOLDER%/temp~ EXACT
167167
END
168168
END
169169

@@ -201,20 +201,18 @@ ACTION_FOR_EACH file IN lua weidu BEGIN
201201
OUTER_SPRINT EVAL ~%file%~ ~%bin%%MOD_FOLDER%%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%%file%%exe%~
202202
END ELSE ACTION_IF (NOT ~%arch_var%~ STR_EQ ~~) AND (FILE_EXISTS ~%MOD_FOLDER%/bin/%WEIDU_OS%/%file%%exe%~) BEGIN
203203
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~
206204
END
207205
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%~
213-
END
214-
END
215206
PRINT ~%file% assigned to %tool%~
216207
END
217208

209+
ACTION_IF NOT ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
210+
OUTER_SPRINT lua ~lua~
211+
PRINT ~lua assigned to %lua%~
212+
OUTER_SPRINT weidu ~weidu~
213+
PRINT ~weidu assigned to %weidu%~
214+
END
215+
218216
///// \\\\\
219217
///// Detect mods installed on BG:EE \\\\\
220218
///// \\\\\
@@ -271,12 +269,14 @@ ACTION_IF NOT ~%log%~ STR_EQ ~~ BEGIN
271269
END
272270

273271
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"~
272+
PRINT ~%shell_cmd%~
274273
AT_NOW ret_val ~%shell_cmd%~
275274
ACTION_IF (ret_val != 0) BEGIN
276275
WARN ~Shell command failed to execute: %shell_cmd%~
277276
END
278277

279278
OUTER_SPRINT shell_cmd ~%lua% %MOD_FOLDER%/lib/tlk_cnt.lua~
279+
PRINT ~%shell_cmd%~
280280
AT_NOW ret_val ~%shell_cmd%~
281281
ACTION_IF (ret_val != 0) BEGIN
282282
WARN ~Shell command failed to execute: %shell_cmd%~
@@ -2767,17 +2767,6 @@ APPEND ~EET.flag~ ~EET_JOURNAL~
27672767
PRINT ~'EET.flag' file is used by WeiDU to recognize the installation as EET~
27682768

27692769

2770-
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
2773-
COPY ~setup-EET.command~ ~setup-%file%.command~
2774-
REPLACE_TEXTUALLY ~EET/EET.tp2 --log SETUP-EET.DEBUG~ ~%file%/%file%.tp2 --log SETUP-%file%.DEBUG~
2775-
END ELSE BEGIN
2776-
COPY ~%weidu%~ ~setup-%file%%exe%~
2777-
END
2778-
END
2779-
2780-
27812770
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
27822771
/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
27832772
///// \\\\\

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 bash
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 bash
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: 2 additions & 0 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

0 commit comments

Comments
 (0)