milo name clash breaks require on Windows

This commit is contained in:
kepler155c@gmail.com
2019-02-08 19:07:40 -05:00
parent af85d0aafb
commit 8a0cf10498
5 changed files with 13 additions and 5 deletions

View File

@@ -8,10 +8,13 @@ local Util = require('util')
local colors = _G.colors
local device = _G.device
local fs = _G.fs
local multishell = _ENV.multishell
local os = _G.os
local shell = _ENV.shell
local turtle = _G.turtle
multishell.setTitle(multishell.getCurrent(), 'Milo')
local function Syntax(msg)
print([[
Turtle must be provided with:

View File

@@ -1,6 +1,12 @@
local device = _G.device
local fs = _G.fs
local shell = _ENV.shell
if device.workbench then
shell.openForegroundTab('Milo')
if fs.exists('packages/milo/Milo.lua') then
fs.delete('packages/milo/Milo.lua')
fs.delete('packages/milo/plugins/listing.lua')
end
if device.workbench then
shell.openForegroundTab('MiloLocal')
end

View File

@@ -10,7 +10,7 @@
[ "eea426f9baef72a8fcefd091e0cec5ab94a76698" ] = {
title = "Milo",
category = "Apps",
run = "Milo",
run = "MiloLocal",
requires = 'advancedTurtle',
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\

View File

@@ -1 +0,0 @@
--moved file

View File

@@ -1,7 +1,7 @@
if not _G.requireInjector then
local BASE ='https://raw.githubusercontent.com/kepler155c/opus/develop-1.8/sys/apis'
_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
local Terminal = require('terminal')