milo name clash breaks require on Windows
This commit is contained in:
@@ -8,10 +8,13 @@ local Util = require('util')
|
|||||||
local colors = _G.colors
|
local colors = _G.colors
|
||||||
local device = _G.device
|
local device = _G.device
|
||||||
local fs = _G.fs
|
local fs = _G.fs
|
||||||
|
local multishell = _ENV.multishell
|
||||||
local os = _G.os
|
local os = _G.os
|
||||||
local shell = _ENV.shell
|
local shell = _ENV.shell
|
||||||
local turtle = _G.turtle
|
local turtle = _G.turtle
|
||||||
|
|
||||||
|
multishell.setTitle(multishell.getCurrent(), 'Milo')
|
||||||
|
|
||||||
local function Syntax(msg)
|
local function Syntax(msg)
|
||||||
print([[
|
print([[
|
||||||
Turtle must be provided with:
|
Turtle must be provided with:
|
||||||
@@ -1,6 +1,12 @@
|
|||||||
local device = _G.device
|
local device = _G.device
|
||||||
|
local fs = _G.fs
|
||||||
local shell = _ENV.shell
|
local shell = _ENV.shell
|
||||||
|
|
||||||
if device.workbench then
|
if fs.exists('packages/milo/Milo.lua') then
|
||||||
shell.openForegroundTab('Milo')
|
fs.delete('packages/milo/Milo.lua')
|
||||||
|
fs.delete('packages/milo/plugins/listing.lua')
|
||||||
|
end
|
||||||
|
|
||||||
|
if device.workbench then
|
||||||
|
shell.openForegroundTab('MiloLocal')
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
[ "eea426f9baef72a8fcefd091e0cec5ab94a76698" ] = {
|
[ "eea426f9baef72a8fcefd091e0cec5ab94a76698" ] = {
|
||||||
title = "Milo",
|
title = "Milo",
|
||||||
category = "Apps",
|
category = "Apps",
|
||||||
run = "Milo",
|
run = "MiloLocal",
|
||||||
requires = 'advancedTurtle',
|
requires = 'advancedTurtle',
|
||||||
iconExt = "\0304\031f\135\129\0314\128\128\031f\130\030f\128\
|
iconExt = "\0304\031f\135\129\0314\128\128\031f\130\030f\128\
|
||||||
\031f\128\031c\159\149\0300\0317\143\0304\031c\149\030f\0314\133\
|
\031f\128\031c\159\149\0300\0317\143\0304\031c\149\030f\0314\133\
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
--moved file
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
if not _G.requireInjector then
|
if not _G.requireInjector then
|
||||||
local BASE ='https://raw.githubusercontent.com/kepler155c/opus/develop-1.8/sys/apis'
|
local BASE ='https://raw.githubusercontent.com/kepler155c/opus/develop-1.8/sys/apis'
|
||||||
_ENV.LUA_PATH=BASE .. '/?.lua'
|
_ENV.LUA_PATH=BASE .. '/?.lua'
|
||||||
load(_G.http.get(_ENV.LUA_PATH .. '/injector.lua').readAll())()(_ENV)
|
load(_G.http.get(BASE .. '/injector.lua').readAll())()(_ENV)
|
||||||
end
|
end
|
||||||
|
|
||||||
local Terminal = require('terminal')
|
local Terminal = require('terminal')
|
||||||
|
|||||||
Reference in New Issue
Block a user