diff --git a/keypadOS.lua b/keypadOS.lua index 78025b9..a438e84 100644 --- a/keypadOS.lua +++ b/keypadOS.lua @@ -3,11 +3,11 @@ local __DEFAULT_IMPORT = require local require = function(path) if __BUNDLER_FILES[path] then return __BUNDLER_FILES[path]() - else - return __DEFAULT_IMPORT(path) + elseif __BUNDLER_FILES[path .. ".lua"] + return __DEFAULT_IMPORT(path .. ".lua") end end -local __UPDATE_HASH = "4db13421e8f5b57961154b92098c42a237ebcdcf" +local __UPDATE_HASH = "7384b0fb8aa0c196aa226eb2e3d2d7a18d323eaa" rawset(__BUNDLER_FILES, "updater.lua", function () local utils = require("utils.lua") local config = require("config.lua") diff --git a/x.py b/x.py index 7f3e304..0690615 100755 --- a/x.py +++ b/x.py @@ -40,18 +40,22 @@ def get_hash(buf: str) -> str: hasher.update(bytes(buf, "utf-8")); return hasher.hexdigest(); +REQ_HEADER = """ +local __BUNDLER_FILES = {} +local __DEFAULT_IMPORT = require +local require = function(path) + if __BUNDLER_FILES[path] then + return __BUNDLER_FILES[path]() + elseif __BUNDLER_FILES[path .. ".lua"] + return __DEFAULT_IMPORT(path .. ".lua") + end +end +local __UPDATE_HASH = __BUNDLER_REPLACE_HASH__ +""" + def main(): buf = "" - buf += "local __BUNDLER_FILES = {}\n"; - buf += "local __DEFAULT_IMPORT = require\n"; - buf += "local require = function(path)\n"; - buf += " if __BUNDLER_FILES[path] then\n"; - buf += " return __BUNDLER_FILES[path]()\n"; - buf += " else\n"; - buf += " return __DEFAULT_IMPORT(path)\n"; - buf += " end\n"; - buf += "end\n"; - buf += "local __UPDATE_HASH = __BUNDLER_REPLACE_HASH__\n"; + buf += REQ_HEADER; for file in FILES: print(f"=== FILE: {file}"); buf += read_file(file);