diff --git a/eris/__main__.py b/eris/__main__.py index 0474f98..2190c89 100755 --- a/eris/__main__.py +++ b/eris/__main__.py @@ -1157,8 +1157,7 @@ def install_all_tools(): install_command = ["apt", "-y", "install"] # debian / ubuntu if "ID=fedora\n" in os_release_lines: tools_.remove("lua-check") - renames = {"lua5.3": "lua", "python3-bandit": "bandit", "ruby3.1": "ruby", - "xz-utils": "xz"} + renames = {"lua5.3": "lua", "python3-bandit": "bandit", "xz-utils": "xz"} tools_ = [renames.get(tool, tool) for tool in tools_] install_command = ["dnf", "-y", "install"] elif "ID=arch\n" in os_release_lines: @@ -1166,8 +1165,8 @@ def install_all_tools(): tools_.remove("python3-pdfminer") # pdf2txt is not in arch tools_.remove("perl-doc") # perldoc is in perl but not in the path tools_.remove("7zip") - renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "ruby3.1": "ruby", "xz-utils": "xz", - "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php", + renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "xz-utils": "xz", "g++": "gcc", + "golang-go": "go", "lua-check": "luacheck", "php-cli": "php", "pylint": "python-pylint", "python3-bandit": "bandit", "python3-mypy": "mypy"} tools_ = [renames.get(tool, tool) for tool in tools_] tools_ = ["python-" + tool[len("python3-"):] if tool.startswith("python3-") else tool @@ -1176,8 +1175,8 @@ def install_all_tools(): elif "ID=alpine\n" in os_release_lines: tools_.remove("python3-bandit") tools_.remove("wabt") - renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "ruby3.1": "ruby", "xz-utils": "xz", - "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php", + renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "xz-utils": "xz", "g++": "gcc", + "golang-go": "go", "lua-check": "luacheck", "php-cli": "php", "pylint": "py3-pylint", "tidy": "tidyhtml"} tools_ = [renames.get(tool, tool) for tool in tools_] tools_ = ["py3-" + tool[len("python3-"):] if tool.startswith("python3-") else tool diff --git a/eris/tools.toml b/eris/tools.toml index 7d4306e..06b624d 100644 --- a/eris/tools.toml +++ b/eris/tools.toml @@ -248,7 +248,7 @@ tools_for_extensions = [ command = "cppcheck --error-exitcode=1" [ruby_syntax] - dependencies = ["ruby3.1"] + dependencies = ["ruby"] url = "http://www.ruby-lang.org/" command = "ruby -c"