From e91e6e6c31d83ee2352613f14c654df928682e9f Mon Sep 17 00:00:00 2001 From: SupinePandora43 <36124472+SupinePandora43@users.noreply.github.com> Date: Mon, 24 Jun 2019 11:53:34 +0400 Subject: [PATCH 01/23] FIX for https://github.com/jkusner/LuaObfuscator/issues/9 https://github.com/jkusner/LuaObfuscator/issues/9 --- stringstripper.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stringstripper.py b/stringstripper.py index 6668bbd..52592b0 100644 --- a/stringstripper.py +++ b/stringstripper.py @@ -50,15 +50,15 @@ def replace(lua, strings, decrypt_func="", start="[[", end="]]"): def strip_multiline_comments(lua): removed = [] - for i in range(len(COMMENT_START)): - r = _build_regex(COMMENT_START[i], COMMENT_END[i]) - while True: - match = r.search(lua) - if match is None: - break - removed.append(match.group(0)) - lua = lua[:match.start()] + lua[match.end():] - print(match) + #for i in range(len(COMMENT_START)): + # r = _build_regex(COMMENT_START[i], COMMENT_END[i]) + # while True: + # match = r.search(lua) + # if match is None: + # break + # removed.append(match.group(0)) + # lua = lua[:match.start()] + lua[match.end():] + # print(match) return lua, removed From cce481bf9626d965cc42f85c311d64388e542315 Mon Sep 17 00:00:00 2001 From: SupinePandora43 <36124472+SupinePandora43@users.noreply.github.com> Date: Mon, 24 Jun 2019 12:26:08 +0400 Subject: [PATCH 02/23] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f644ab9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 SupinePandora43 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 49bbc67b786d87cf22e8b67dc3f7ce182a7b8097 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 14:19:02 +0500 Subject: [PATCH 03/23] idk --- .editorconfig | 16 ++++++++++++++++ .gitignore | 3 +++ .travis.yml | 35 +++++++++++++++++++++++++++++++++++ .vscode/launch.json | 12 ++++++++++++ .vscode/settings.json | 3 +++ __main__.py | 24 +++--------------------- finalize.py | 5 +++-- obfuscator.py | 11 +++++++---- stringencoder.py | 6 ++++-- stringstripper.py | 7 +++++-- tokenizer.py | 11 +++++++---- 11 files changed, 98 insertions(+), 35 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitignore create mode 100644 .travis.yml create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..8d07a08 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +end_of_line = crlf +indent_style = tab +indent_size = 4 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.py] +indent_style = space + +[*.yml] +indent_style = space +indent_size = 2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..929e77f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.spec +dist +build diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..c3a4ecb --- /dev/null +++ b/.travis.yml @@ -0,0 +1,35 @@ +# env: + # global: + # - PYTHONIOENCODING=utf-8 + +jobs: + include: + - os: windows + language: shell + env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + before_install: + - choco install --x86 python + - os: linux + language: generic + +install: +- pip install pyinstaller + +branches: + only: + - master + +script: +- pyinstaller --onefile __main__.py -n LuaObfuscator +- ls ./dist +before_deploy: +- export TRAVIS_TAG=$(date +'%Y.%m.%d') +deploy: + provider: releases + api_key: $GITHUB_TOKEN + file_glob: true + file: ./dist/LuaObfuscator* + skip_cleanup: true + name: $(date +'%Y.%m.%d-%H_%M_%S') - $TRAVIS_OS_NAME + on: + branch: master diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..9197864 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,12 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Debug", + "type": "python", + "request": "launch", + "program": "${workspaceFolder}/__main__.py", + "console": "integratedTerminal" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..58eb1df --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.jediEnabled": false +} \ No newline at end of file diff --git a/__main__.py b/__main__.py index df90885..9b47504 100644 --- a/__main__.py +++ b/__main__.py @@ -15,12 +15,6 @@ print("The obfuscator may not work correctly!") -VERSION = "Beta 1.0.3" -VERSION_DATE = time.strftime("%b %d, %Y @ %I:%M %p", time.localtime(os.path.getmtime(__file__))) - -print("Version: {0} (Updated on {1})".format(VERSION, VERSION_DATE)) - - in_file = "input.lua" out_file = "output.lua" decrypt_file = "__decrypt.lua" @@ -39,9 +33,6 @@ parser.add_argument("--level", help='0 = original strings, 1 = small file, 2 = large file, 3 = huge file', default=1) -parser.add_argument("--dontcopy", - help='Disable copying the output', - action='store_true') parser.add_argument("--debug", help="Enable debug mode", action='store_true') @@ -67,9 +58,9 @@ with open(global_file, "r") as f: globs = json.loads(f.read()) - # Do the obfuscation - lua, tokens, strings, comments = obfuscator.obfuscate(lua, encoder, globs, debug_mode) + lua, tokens, strings, comments = obfuscator.obfuscate( + lua, encoder, globs, debug_mode) except: if not debug_mode: @@ -79,15 +70,6 @@ raise -if not dontcopy: - try: - import pyperclip - pyperclip.copy(lua) - print("Code copied to clipboard.") - except: - pass - - # Write the results with open(out_file, "wb") as f: - f.write(lua.encode("utf-8")) \ No newline at end of file + f.write(lua.encode("utf-8")) diff --git a/finalize.py b/finalize.py index 02faf69..b8d7f62 100644 --- a/finalize.py +++ b/finalize.py @@ -1,7 +1,8 @@ import re import tokenizer -WORD_PTRN = re.compile(r"^[^" + re.escape("".join(tokenizer.SPECIAL_CHARS)) + r"]*$") +WORD_PTRN = re.compile( + r"^[^" + re.escape("".join(tokenizer.SPECIAL_CHARS)) + r"]*$") def finalize(tokens, decrypt_code): @@ -43,4 +44,4 @@ def render_code(tokens, decrypt_code): def is_word(s): - return WORD_PTRN.match(s) \ No newline at end of file + return WORD_PTRN.match(s) diff --git a/obfuscator.py b/obfuscator.py index 0f6de30..0592d04 100644 --- a/obfuscator.py +++ b/obfuscator.py @@ -49,7 +49,8 @@ def obfuscate(lua, encoder, globs, debug=False, xor_val=-1): # Strip comments and strings lua, strings, comments = stringstripper.strip(lua) - log("Stripped {0} strings and {1} comments.".format(len(strings), len(comments)), False) + log("Stripped {0} strings and {1} comments.".format( + len(strings), len(comments)), False) # Tokenize tokens = tokenizer.tokenize(lua) @@ -96,7 +97,8 @@ def obfuscate(lua, encoder, globs, debug=False, xor_val=-1): strings = encoder.encode_all(strings, xor_val) log("Obfuscated strings.") - tokens = stringstripper.replace(tokens, strings, DECRYPT_FUNC, encoder.get_str_start(), encoder.get_str_end()) + tokens = stringstripper.replace( + tokens, strings, DECRYPT_FUNC, encoder.get_str_start(), encoder.get_str_end()) log("Replaced strings.") lua = finalize.finalize(tokens, decrypt_code) @@ -297,7 +299,8 @@ def rename_loops(tokens): args = tokens[i+1:e:2] for arg in args: if arg not in replaced: - tokens = replace_locals(tokens, arg, new_local_name(index(tokens, arg)), i) + tokens = replace_locals( + tokens, arg, new_local_name(index(tokens, arg)), i) replaced.append(arg) return tokens @@ -457,4 +460,4 @@ def index(tokens, item, start_index=0): i = tokens.index(item, start_index) return i except: - return -1 \ No newline at end of file + return -1 diff --git a/stringencoder.py b/stringencoder.py index 0965df9..2c783b5 100644 --- a/stringencoder.py +++ b/stringencoder.py @@ -101,6 +101,7 @@ class Level3Encoder(Encoder): Up to 2 additional ascii characters will be added, and then each character is closed with '|'. """ + def __init__(self): self.level = 3 @@ -113,7 +114,8 @@ def encode_char(self, c, xor): # number of invis characters (lua counts 1 invis as 3) invis = math.floor(total / 3) - regchars = ''.join(random.choice(ascii_letters + digits) for _ in range(regular)) + regchars = ''.join(random.choice(ascii_letters + digits) + for _ in range(regular)) return obfuscator.INVISIBLE_CHAR * invis + regchars + "|" @@ -132,4 +134,4 @@ def get_by_level(level): def _read_decrypt_file(level, xor): with open("__decrypt_" + str(level) + ".lua", "rb") as f: - return f.read().decode("utf-8").replace("__XOR__", str(xor)) \ No newline at end of file + return f.read().decode("utf-8").replace("__XOR__", str(xor)) diff --git a/stringstripper.py b/stringstripper.py index 52592b0..2448c03 100644 --- a/stringstripper.py +++ b/stringstripper.py @@ -50,7 +50,7 @@ def replace(lua, strings, decrypt_func="", start="[[", end="]]"): def strip_multiline_comments(lua): removed = [] - #for i in range(len(COMMENT_START)): + # for i in range(len(COMMENT_START)): # r = _build_regex(COMMENT_START[i], COMMENT_END[i]) # while True: # match = r.search(lua) @@ -110,7 +110,8 @@ def _strip_regular_strings(lua): if found is not None: placeholder = _build_string_placeholder() removed[placeholder] = found.group()[len(start):-len(end)] - lua = lua[:found.start()] + " " + placeholder + " " + lua[found.end():] + lua = lua[:found.start()] + " " + placeholder + \ + " " + lua[found.end():] else: break @@ -133,6 +134,8 @@ def _strip_multiline_strings(lua): string_index = -1 + + def _build_string_placeholder(): global string_index string_index += 1 diff --git a/tokenizer.py b/tokenizer.py index 20bff90..6f45a5c 100644 --- a/tokenizer.py +++ b/tokenizer.py @@ -23,14 +23,16 @@ TOKEN_PATTERN = re.compile(r"(\d*\.?\d+|[^\s" # Checks for decimals with optional lead and required end ex: ".5", "0.5" + re.escape("".join(SPECIAL_CHARS)) + r"]+|" - + re.escape("___sep___".join(SPECIAL_STRINGS)).replace("___sep___", "|") + r"|[" + + re.escape("___sep___".join(SPECIAL_STRINGS) + ).replace("___sep___", "|") + r"|[" + re.escape("".join(SPECIAL_CHARS)) + r"])") WORD_PATTERN = re.compile(r"^[^\s" + re.escape("".join(SPECIAL_CHARS)) + r"]+$") SCOPE_IN = ['do', 'then', 'function'] -SCOPE_OUT = ['end', 'elseif'] # 'elseif' because it comes with a second 'then'. +# 'elseif' because it comes with a second 'then'. +SCOPE_OUT = ['end', 'elseif'] def tokenize(lua): @@ -136,7 +138,8 @@ def find_table_end(tokens, start_index): if depth == 0: return i + 1 - print("Fatal error occurred.", "Please check that your input is syntactically correct.", sep="\n") + print("Fatal error occurred.", + "Please check that your input is syntactically correct.", sep="\n") exit(0) @@ -162,4 +165,4 @@ def is_word(s): def is_number(s): - return s.isdigit() \ No newline at end of file + return s.isdigit() From a415e1a8e3bf2980dc5cb66253cc98bda832afa5 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 14:28:31 +0500 Subject: [PATCH 04/23] I"M STUPID --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index c3a4ecb..c2b07d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ jobs: before_install: - choco install --x86 python - os: linux + language: python + # dist: xenial # ↓ + python: "3.6" # 3.6 works! + - os: osx language: generic install: From 50aafc43bd06756a9140c76ec0fe5fe2d1d4c239 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 14:56:10 +0500 Subject: [PATCH 05/23] tests --- .travis.yml | 5 +++-- __version__.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 __version__.py diff --git a/.travis.yml b/.travis.yml index c2b07d6..8054811 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,14 @@ script: - pyinstaller --onefile __main__.py -n LuaObfuscator - ls ./dist before_deploy: -- export TRAVIS_TAG=$(date +'%Y.%m.%d') +- python __version__.py +- export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') deploy: provider: releases api_key: $GITHUB_TOKEN file_glob: true file: ./dist/LuaObfuscator* skip_cleanup: true - name: $(date +'%Y.%m.%d-%H_%M_%S') - $TRAVIS_OS_NAME + name: $LOV - $TRAVIS_OS_NAME on: branch: master diff --git a/__version__.py b/__version__.py new file mode 100644 index 0000000..727f906 --- /dev/null +++ b/__version__.py @@ -0,0 +1,5 @@ +VERSION = "0.1.0" + +if __name__ == "__main__": + import os + os.environ["LOV"] = VERSION From 1c48423ee450f7d16840d8910738952569533788 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 15:13:10 +0500 Subject: [PATCH 06/23] df --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8054811..2efb1a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # env: # global: # - PYTHONIOENCODING=utf-8 - +sudo: required jobs: include: - os: windows @@ -9,9 +9,11 @@ jobs: env: PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install --x86 python + before_deploy: + - runas /noprofile /user:Administrator python __version__.py + - export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') - os: linux language: python - # dist: xenial # ↓ python: "3.6" # 3.6 works! - os: osx language: generic @@ -27,7 +29,7 @@ script: - pyinstaller --onefile __main__.py -n LuaObfuscator - ls ./dist before_deploy: -- python __version__.py +- sudo python __version__.py - export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') deploy: provider: releases From f805468a45b922fb534719c67475f853375ddddd Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 15:18:47 +0500 Subject: [PATCH 07/23] idk --- .travis.yml | 7 +------ __version__.py | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 __version__.py diff --git a/.travis.yml b/.travis.yml index 2efb1a6..10c1493 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ # env: # global: # - PYTHONIOENCODING=utf-8 -sudo: required jobs: include: - os: windows @@ -9,9 +8,6 @@ jobs: env: PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install --x86 python - before_deploy: - - runas /noprofile /user:Administrator python __version__.py - - export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') - os: linux language: python python: "3.6" # 3.6 works! @@ -29,7 +25,6 @@ script: - pyinstaller --onefile __main__.py -n LuaObfuscator - ls ./dist before_deploy: -- sudo python __version__.py - export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') deploy: provider: releases @@ -37,6 +32,6 @@ deploy: file_glob: true file: ./dist/LuaObfuscator* skip_cleanup: true - name: $LOV - $TRAVIS_OS_NAME + name: $TRAVIS_OS_NAME on: branch: master diff --git a/__version__.py b/__version__.py deleted file mode 100644 index 727f906..0000000 --- a/__version__.py +++ /dev/null @@ -1,5 +0,0 @@ -VERSION = "0.1.0" - -if __name__ == "__main__": - import os - os.environ["LOV"] = VERSION From 95ca1b241ed59b84172b5b38f5bca4697071b78c Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 15:44:21 +0500 Subject: [PATCH 08/23] win x32 / win x64 --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10c1493..6e9c4fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,14 @@ jobs: include: - os: windows language: shell - env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: OARCH=x32 PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install --x86 python + - os: windows + language: shell + env: OARCH=x64 PATH=/c/Python37:/c/Python37/Scripts:$PATH + before_install: + - choco install python - os: linux language: python python: "3.6" # 3.6 works! @@ -32,6 +37,6 @@ deploy: file_glob: true file: ./dist/LuaObfuscator* skip_cleanup: true - name: $TRAVIS_OS_NAME + name: $TRAVIS_OS_NAME $OARCH on: branch: master From 0c914b67fe4b4c2664b24a220a7b8b75ff9c7fdc Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 15:51:02 +0500 Subject: [PATCH 09/23] SOSAT --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e9c4fc..2aef385 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,18 @@ jobs: include: - os: windows language: shell - env: OARCH=x32 PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: + global: + - SOSAT=x32 + - PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install --x86 python - os: windows language: shell - env: OARCH=x64 PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: + global: + - SOSAT=x64 + - PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install python - os: linux @@ -37,6 +43,6 @@ deploy: file_glob: true file: ./dist/LuaObfuscator* skip_cleanup: true - name: $TRAVIS_OS_NAME $OARCH + name: $TRAVIS_OS_NAME $SOSAT on: branch: master From 11dd686524376af8ada3dd820751f5b2addf4da5 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 15:54:04 +0500 Subject: [PATCH 10/23] waht the SUCK --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2aef385..1033e3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,13 @@ jobs: include: - os: windows language: shell - env: - global: - - SOSAT=x32 - - PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: SOSAT=x32 PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install --x86 python - os: windows language: shell env: - global: - - SOSAT=x64 - - PATH=/c/Python37:/c/Python37/Scripts:$PATH + global: SOSAT=x64 PATH=/c/Python37:/c/Python37/Scripts:$PATH before_install: - choco install python - os: linux From 7804823434badfb974f841e4ebc8073102147ab8 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 16:12:12 +0500 Subject: [PATCH 11/23] idk --- .travis.yml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1033e3c..16ff329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,21 +5,28 @@ jobs: include: - os: windows language: shell - env: SOSAT=x32 PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: SOSAT=x32 before_install: + - export PATH=/c/Python37:/c/Python37/Scripts:$PATH - choco install --x86 python + - choco install zip - os: windows language: shell - env: - global: SOSAT=x64 PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: SOSAT=x64 before_install: + - export PATH=/c/Python37:/c/Python37/Scripts:$PATH - choco install python + - choco install zip - os: linux language: python python: "3.6" # 3.6 works! - os: osx language: generic - +sudo: required +addons: + apt: + packages: + - zip install: - pip install pyinstaller @@ -30,14 +37,21 @@ branches: script: - pyinstaller --onefile __main__.py -n LuaObfuscator - ls ./dist +- | + if [ $TRAVIS_OS_NAME != "windows" ]; then + zip -r ./LuaObfuscator-$TRAVIS_OS_NAME ./dist + else + zip -r ./LuaObfuscator-win-$SOSAT ./dist + fi + before_deploy: - export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') deploy: provider: releases api_key: $GITHUB_TOKEN file_glob: true - file: ./dist/LuaObfuscator* + file: ./LuaObfuscator-* skip_cleanup: true - name: $TRAVIS_OS_NAME $SOSAT + name: $(date +'%Y.%m.%d-%H_%M_%S') on: branch: master From d05e1d880daa7db66da505c946ac9480392c7f08 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 16:17:47 +0500 Subject: [PATCH 12/23] python3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16ff329..e47351c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,14 @@ jobs: env: SOSAT=x32 before_install: - export PATH=/c/Python37:/c/Python37/Scripts:$PATH - - choco install --x86 python + - choco install --x86 python3 - choco install zip - os: windows language: shell env: SOSAT=x64 before_install: - export PATH=/c/Python37:/c/Python37/Scripts:$PATH - - choco install python + - choco install python3 - choco install zip - os: linux language: python From 27cc6b8cb3859fd3b5f683b780428d4e2431b65b Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 16:21:24 +0500 Subject: [PATCH 13/23] terasdsadasdasdsa --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e47351c..06c061c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,7 @@ jobs: python: "3.6" # 3.6 works! - os: osx language: generic -sudo: required -addons: - apt: - packages: - - zip + install: - pip install pyinstaller From 7ac8a63c00e30d7a10ca8766f1ae5db4c1f34f44 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 16:32:40 +0500 Subject: [PATCH 14/23] tests --- .travis.yml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06c061c..79f4045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,24 +5,29 @@ jobs: include: - os: windows language: shell - env: SOSAT=x32 - before_install: - - export PATH=/c/Python37:/c/Python37/Scripts:$PATH - - choco install --x86 python3 - - choco install zip + env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + before_install: choco install --x86 python - os: windows language: shell - env: SOSAT=x64 - before_install: - - export PATH=/c/Python37:/c/Python37/Scripts:$PATH - - choco install python3 - - choco install zip + env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + before_install: choco install python + script: + - pyinstaller --onefile __main__.py -n LuaObfuscator + - ls ./dist + - zip -r ./LuaObfuscator-win-x64 ./dist + - ls ./ - os: linux language: python python: "3.6" # 3.6 works! - os: osx language: generic - +cache: + directories: + - ./dist +addons: + apt: + packages: + - zip install: - pip install pyinstaller @@ -37,17 +42,18 @@ script: if [ $TRAVIS_OS_NAME != "windows" ]; then zip -r ./LuaObfuscator-$TRAVIS_OS_NAME ./dist else - zip -r ./LuaObfuscator-win-$SOSAT ./dist + zip -r ./LuaObfuscator-win-x32 ./dist fi +- ls ./ before_deploy: -- export TRAVIS_TAG=$(date +'%Y.%m.%d-%H_%M_%S') +- export TRAVIS_TAG=$(date +'%Y.%m.%d') deploy: provider: releases api_key: $GITHUB_TOKEN file_glob: true file: ./LuaObfuscator-* skip_cleanup: true - name: $(date +'%Y.%m.%d-%H_%M_%S') + name: $(date +'%Y.%m.%d') on: branch: master From 24521b6953968ffd0ec369b04712e65557a7fd5c Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 16:42:11 +0500 Subject: [PATCH 15/23] --pre --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79f4045..0b1f476 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ jobs: - os: windows language: shell env: PATH=/c/Python37:/c/Python37/Scripts:$PATH - before_install: choco install --x86 python + before_install: choco install --pre --x86 python - os: windows language: shell env: PATH=/c/Python37:/c/Python37/Scripts:$PATH - before_install: choco install python + before_install: choco install --pre python script: - pyinstaller --onefile __main__.py -n LuaObfuscator - ls ./dist From 84b8f1929af6fae42e775c50e0d742e064367a83 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 24 Jun 2019 17:00:52 +0500 Subject: [PATCH 16/23] without --pre --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b1f476..79f4045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ jobs: - os: windows language: shell env: PATH=/c/Python37:/c/Python37/Scripts:$PATH - before_install: choco install --pre --x86 python + before_install: choco install --x86 python - os: windows language: shell env: PATH=/c/Python37:/c/Python37/Scripts:$PATH - before_install: choco install --pre python + before_install: choco install python script: - pyinstaller --onefile __main__.py -n LuaObfuscator - ls ./dist From 0d9e92b05846865556c50a59dbe2ca6ace53fa1e Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 25 Jun 2019 18:47:26 +0500 Subject: [PATCH 17/23] =?UTF-8?q?=D1=82=D1=83=D1=86=20=D0=B4=D1=88=D1=82?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 79f4045..e9c3afe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ script: before_deploy: - export TRAVIS_TAG=$(date +'%Y.%m.%d') + deploy: provider: releases api_key: $GITHUB_TOKEN From 92ec521fa1e56e44df3f75e00db3d073e714b7e2 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 25 Jun 2019 22:02:26 +0500 Subject: [PATCH 18/23] idk --- .travis.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9c3afe..255b610 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,16 +6,19 @@ jobs: - os: windows language: shell env: PATH=/c/Python37:/c/Python37/Scripts:$PATH - before_install: choco install --x86 python + before_install: + - choco install --x86 python + - choco install zip + after_script: + - zip -r ./LuaObfuscator-win-x32 ./dist - os: windows language: shell env: PATH=/c/Python37:/c/Python37/Scripts:$PATH - before_install: choco install python - script: - - pyinstaller --onefile __main__.py -n LuaObfuscator - - ls ./dist + before_install: + - choco install python + - choco install zip + after_script: - zip -r ./LuaObfuscator-win-x64 ./dist - - ls ./ - os: linux language: python python: "3.6" # 3.6 works! @@ -37,15 +40,8 @@ branches: script: - pyinstaller --onefile __main__.py -n LuaObfuscator -- ls ./dist -- | - if [ $TRAVIS_OS_NAME != "windows" ]; then - zip -r ./LuaObfuscator-$TRAVIS_OS_NAME ./dist - else - zip -r ./LuaObfuscator-win-x32 ./dist - fi -- ls ./ - +after_script: +- zip -r ./LuaObfuscator-$TRAVIS_OS_NAME ./dist before_deploy: - export TRAVIS_TAG=$(date +'%Y.%m.%d') From 353ce15c035d96e7eea7c7ef7a694ed26fe54fab Mon Sep 17 00:00:00 2001 From: SupinePandora43 <36124472+SupinePandora43@users.noreply.github.com> Date: Tue, 25 Jun 2019 21:34:32 +0400 Subject: [PATCH 19/23] some edits --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 255b610..6bcc840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ jobs: before_install: - choco install --x86 python - choco install zip - after_script: + script: - zip -r ./LuaObfuscator-win-x32 ./dist - os: windows language: shell @@ -17,7 +17,7 @@ jobs: before_install: - choco install python - choco install zip - after_script: + script: - zip -r ./LuaObfuscator-win-x64 ./dist - os: linux language: python @@ -38,9 +38,9 @@ branches: only: - master -script: +before_script: - pyinstaller --onefile __main__.py -n LuaObfuscator -after_script: +script: - zip -r ./LuaObfuscator-$TRAVIS_OS_NAME ./dist before_deploy: - export TRAVIS_TAG=$(date +'%Y.%m.%d') From dd9ca33aa8ce91118172bf660a0d731c450f2ae8 Mon Sep 17 00:00:00 2001 From: SupinePandora43 <36124472+SupinePandora43@users.noreply.github.com> Date: Tue, 25 Jun 2019 21:41:22 +0400 Subject: [PATCH 20/23] ls dist --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6bcc840..23d67de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ branches: - master before_script: +- ls ./dist - pyinstaller --onefile __main__.py -n LuaObfuscator script: - zip -r ./LuaObfuscator-$TRAVIS_OS_NAME ./dist From 10c01ed938dfaca37a9fd2ffc57684e80b780ec8 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 2 Jun 2020 10:31:23 +0500 Subject: [PATCH 21/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d468672..4d3a8c2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# LuaObfuscator +# LuaObfuscator [![Build Status](https://travis-ci.com/SupinePandora43/LuaObfuscator.svg)](https://travis-ci.com/SupinePandora43/LuaObfuscator) This lua obfuscator was originally designed for Garry's Mod, but should work on vanilla lua. Written for private use in January 2016. I never did anything with it so I decided to put it on GitHub. From 8af14f9d52a7bcd37414123b9748e50c8608e184 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 2 Jun 2020 10:35:56 +0500 Subject: [PATCH 22/23] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23d67de..466f742 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ jobs: include: - os: windows language: shell - env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: PATH=/c/Python38:/c/Python38/Scripts:$PATH before_install: - choco install --x86 python - choco install zip @@ -13,7 +13,7 @@ jobs: - zip -r ./LuaObfuscator-win-x32 ./dist - os: windows language: shell - env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: PATH=/c/Python38:/c/Python38/Scripts:$PATH before_install: - choco install python - choco install zip From 2f27b3044ed0e084816a5270a686dfaaa0f6b7d5 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 2 Jun 2020 11:10:45 +0500 Subject: [PATCH 23/23] Delete LICENSE --- LICENSE | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f644ab9..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 SupinePandora43 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.