From e1fbc5318081456b8e3a8d7668fa1794241779da Mon Sep 17 00:00:00 2001 From: minexew Date: Mon, 24 Feb 2020 13:38:36 +0100 Subject: [PATCH 1/2] Remove files that were no longer present in the final snapshot --- .../Demo/AcctExample/AlienProject/AlienMain.HC | 17 ----------------- .../AlienProject/AlienWorkingDir.HC | Bin 309 -> 0 bytes 2 files changed, 17 deletions(-) delete mode 100644 TempleOSCD/Demo/AcctExample/AlienProject/AlienMain.HC delete mode 100644 TempleOSCD/Demo/AcctExample/AlienProject/AlienWorkingDir.HC diff --git a/TempleOSCD/Demo/AcctExample/AlienProject/AlienMain.HC b/TempleOSCD/Demo/AcctExample/AlienProject/AlienMain.HC deleted file mode 100644 index 2b29070..0000000 --- a/TempleOSCD/Demo/AcctExample/AlienProject/AlienMain.HC +++ /dev/null @@ -1,17 +0,0 @@ - -Cd(__DIR__);; - -#include "AlienWorkingDir" - - - -U0 AlienGame() -{ - "This is our alien game.\n"; - PressAKey; - ShowWorkingDir; -} - - -AlienGame; - diff --git a/TempleOSCD/Demo/AcctExample/AlienProject/AlienWorkingDir.HC b/TempleOSCD/Demo/AcctExample/AlienProject/AlienWorkingDir.HC deleted file mode 100644 index 0236f242f7f90acc411d80c2dcf5a59ee9220800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmd;52@cRvvN5z%(sA;%HB{k32cZTE!5R7G;rT_`nR)3hnME3!T-96(3c&?MnI)+j zDxOZr+BL1YxVRJ)lw$G-!SGat#G+J%%shpXjLc$%l+2>kvNw_;tp zw$4DJjJ417Ke3=E+R3=Bdb^8hPPM124N -- 2.56.0 From 4d1bf28c658e44af590045eb2b910eab1e0d1b60 Mon Sep 17 00:00:00 2001 From: minexew Date: Mon, 24 Feb 2020 13:35:52 +0100 Subject: [PATCH 2/2] Fix incorrect decompression of binary files, update previously corrupted Compiler.BIN --- TempleOSCD/Compiler/Compiler.BIN | Bin 193087 -> 193792 bytes extract_templeos.py | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 9658a4b417457bee86020dc99028ed8edfd6a995..ab59fde93f6f53143edda89909b2d25be03790ef 100644 GIT binary patch delta 5937 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
    ZTbEc<^^3z|MGZ`|nZkMuPQU$r zetL)%6DW(Fvtp89WL^HuiV5VB=hjU9pj27z#B>GJ{C8&3XJnmT<;?Vnk#%~G3y9ht z=gO4I%qH&{lEn}{eS;5^*!KG#OdO!(_1uf88ANCKG6jKRb&ns@b4J$bi~X7IGO})O z2w+MDHDsQKGG#HcPWKOE0wvfPVNBQA7+JUH$1?eVe7if1X(c1;^ptcae@52no70(m z8Cj=gFm*DrPS5gXQk}jogXuOS>-5e{CL2c9=|?k}tQc9h|IcLF3i9UGY$kg~`RQM? znM@d2r)%agfjUJWbC~us%5UG8%OnX>b2^V{9;5vBtb8UbkQvTwU{ zA=4XBD$y@xdd$eWU8sy{0!Y!Ka;A1h*6o@VOfx{-gOyC6)XG@JWCu!oRZI&(?aT*t zOl?e3tQ-ssp!A)=#R3|?%Fq7)KRk=UGdP2FdR-%vBB-y{2nzA-+Z&lc!vx!JH!;P4 z61#aDlM^WLDm$3GxENWdAD+ad#>l$;-1^} zH48%Rgitpi)OQFaHVv%ObQ)7OBkS}9)0p}gS*PnwXEI=9-5xic3Dkw$zIq1JF;Kh| z&I5(@^nLR{iEz90e5P&8pn`r8Q!*p#c9X?Szd*@MZz+=}BQq-l!*qvbOj_F)FJqDg z2_IO_#0YZb!4*tX7+I%>t_0iAx{~Q6Q$46Z8j|H7_Cn|4|Nk$yK)60(FJwX7r4X)r z*b6=ocN&E26!zl(h5!Fwwu8B0FK%7>|Nmtbn3KW!?K?x*iwclP21JAfERqHi2?L9S zy*POJ|NobsV2(l9i<-0l|G%^W^TJ-d2XXYFoKNTe|9=T;MR|sVz4&_m|NobwtkWG= zFo{k7;LF6lU0^MfCnzo=w=Y&eX>vZzTU)LPpY8(pHIey7~?#8+BG2<}T)6 z%vmhASiD#Z+1lBTGreOHQG&oi)`_eeSue7FWZmApgXtPOBkT6a15DDOQn>UGlQ*OM z_JfC**g;`<;xN+!Hb(jFnWvbvKz*etXPAsY%8s97ddw)lef4=JaL;7pMWzTw*6Ey= zm~0v4x4U0rdJ4+8x>uM?*%?`QD$BV0|)DNp*u{* zpqj$%0aG2L{Pd#_n3_QSpodKMtc>#8JDxFhfm|Wy-+IH8$_fCO*p^oS delta 5097 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 diff --git a/extract_templeos.py b/extract_templeos.py index b16f839..9a42a5c 100755 --- a/extract_templeos.py +++ b/extract_templeos.py @@ -45,8 +45,10 @@ def decompress_all_files_in(path): decompress_all_files_in(full_path) elif full_path.endswith('.Z'): decompressed_path = full_path[0:len(full_path)-2] - subprocess.check_call(['./TOSZ', '-ascii', full_path, decompressed_path]) - os.remove(full_path) + if full_path.endswith('.BIN.Z'): + subprocess.check_call(['./TOSZ', full_path, decompressed_path]) + else: + subprocess.check_call(['./TOSZ', '-ascii', full_path, decompressed_path]) # Extract TempleOS disk tree extract('', OUTPUT_DIR) -- 2.56.0