From 6ae9f96ace5291637a908fbd58b1c8e1d9c28009 Mon Sep 17 00:00:00 2001
From: Yesseruser <67008763+yesseruser@users.noreply.github.com>
Date: Thu, 15 Apr 2021 18:11:51 +0200
Subject: [PATCH 1/6] Update README.md
---
README.md | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/README.md b/README.md
index 5e9f684..4c3713f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
# Opus OS for computercraft
@@ -15,6 +16,19 @@
* Turtle follow (with GPS) and turtle come to you (without GPS)
## Install
+First run this code:
+```
+lua
+```
+Then insert this:
+```lua
+local r = http.get("https://pastebin.com/raw/jCfCfBPn"); local f = fs.open( shell.resolve( "pastebin" ), "w" ); f.write( r.readAll() ); f.close(); r.close()
+```
+Press enter, then insert this and press enter:
+```lua
+exit()
+```
+Then run this:
```
pastebin run UzGHLbNC
```
--
2.49.1
From 8dcd5ecc6858a0c60c3ef1ed855c227b9a3887d1 Mon Sep 17 00:00:00 2001
From: Yesseruser <67008763+yesseruser@users.noreply.github.com>
Date: Thu, 15 Apr 2021 18:14:42 +0200
Subject: [PATCH 2/6] Update README.md
---
README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4c3713f..9c9554e 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
* Turtle follow (with GPS) and turtle come to you (without GPS)
## Install
-First run this code:
+First run this:
```
lua
```
@@ -24,11 +24,14 @@ Then insert this:
```lua
local r = http.get("https://pastebin.com/raw/jCfCfBPn"); local f = fs.open( shell.resolve( "pastebin" ), "w" ); f.write( r.readAll() ); f.close(); r.close()
```
+This crates a new copy of pastebin program, with fixed HTTPS.
Press enter, then insert this and press enter:
```lua
exit()
```
+This exits the lua bash.
Then run this:
```
pastebin run UzGHLbNC
```
+This downloads and immedeately runs the installer.
--
2.49.1
From 7d9029c70643a85e2034747048dd1c83d7a78180 Mon Sep 17 00:00:00 2001
From: xAnavrins
Date: Tue, 16 Nov 2021 22:59:19 -0500
Subject: [PATCH 3/6] Reduce peripheral calls in Network app Add a manual
refresh button instead
---
sys/apps/Network.lua | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/sys/apps/Network.lua b/sys/apps/Network.lua
index f5f91d3..52bc974 100644
--- a/sys/apps/Network.lua
+++ b/sys/apps/Network.lua
@@ -85,8 +85,14 @@ local page = UI.Page {
title = 'Ports',
event = 'ports_hide',
},
- grid = UI.ScrollingGrid {
+ menuBar = UI.MenuBar {
y = 2,
+ buttons = {
+ { text = 'Refresh', event = 'ports_update' },
+ }
+ },
+ grid = UI.ScrollingGrid {
+ y = 3,
columns = {
{ heading = 'Port', key = 'port' },
{ heading = 'State', key = 'state' },
@@ -214,11 +220,16 @@ function page:eventHandler(event)
self.ports.grid:update()
self.ports:show()
- self.portsHandler = Event.onInterval(3, function()
+ -- self.portsHandler = Event.onInterval(3, function()
+ -- self.ports.grid:update()
+ -- self.ports.grid:draw()
+ -- self:sync()
+ -- end)
+
+ elseif event.type == 'ports_update' then
self.ports.grid:update()
self.ports.grid:draw()
self:sync()
- end)
elseif event.type == 'ports_hide' then
Event.off(self.portsHandler)
--
2.49.1
From 7c5f749f0245545fb3132c81001d1b13c272172f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Nov 2021 04:00:12 +0000
Subject: [PATCH 4/6] Update version date
---
.opus_version | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/.opus_version b/.opus_version
index 18e6cb1..ab93bfd 100644
--- a/.opus_version
+++ b/.opus_version
@@ -1,6 +1,7 @@
-Sat Feb 20 01:11:25 UTC 2021
-commit 16d233df5d0cd0184b252b9380cc4a0843b2a148
-Author: Anavrins
-Date: Fri Feb 19 20:11:13 2021 -0500
+Wed Nov 17 04:00:09 UTC 2021
+commit 7d9029c70643a85e2034747048dd1c83d7a78180
+Author: xAnavrins
+Date: Tue Nov 16 22:59:19 2021 -0500
- Actually working bug/feature templates
+ Reduce peripheral calls in Network app
+ Add a manual refresh button instead
--
2.49.1
From 3150525ee2024fc605669093b89f75f0c741a81f Mon Sep 17 00:00:00 2001
From: Kan18 <24967425+Kan18@users.noreply.github.com>
Date: Mon, 4 Jul 2022 00:08:59 -0400
Subject: [PATCH 5/6] Fix #48 (shell resolving issue) (#58)
---
sys/apps/shell.lua | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sys/apps/shell.lua b/sys/apps/shell.lua
index a08e0b0..1eecbfa 100644
--- a/sys/apps/shell.lua
+++ b/sys/apps/shell.lua
@@ -173,15 +173,12 @@ function shell.resolveProgram(_sCommand)
end
end
- if not _sCommand:find('/') then
- return inPath()
- end
-
-- so... even if you are in the rom directory and you run:
-- 'packages/common/edit.lua', allow this even though it
-- does not use a leading slash. Ideally, fs.combine would
-- provide the leading slash... but it does not.
- return check(shell.resolve(_sCommand))
+ return (not _sCommand:find('/')) and inPath()
+ or check(shell.resolve(_sCommand))
or check(shell.resolve(_sCommand) .. '.lua')
or check(_sCommand)
or check(_sCommand .. '.lua')
--
2.49.1
From 4104750539695affeb6518947b53ef0c5ba372fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Mon, 4 Jul 2022 04:09:14 +0000
Subject: [PATCH 6/6] Update version date
---
.opus_version | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.opus_version b/.opus_version
index ab93bfd..911be79 100644
--- a/.opus_version
+++ b/.opus_version
@@ -1,7 +1,6 @@
-Wed Nov 17 04:00:09 UTC 2021
-commit 7d9029c70643a85e2034747048dd1c83d7a78180
-Author: xAnavrins
-Date: Tue Nov 16 22:59:19 2021 -0500
+Mon Jul 4 04:09:12 UTC 2022
+commit 3150525ee2024fc605669093b89f75f0c741a81f
+Author: Kan18 <24967425+Kan18@users.noreply.github.com>
+Date: Mon Jul 4 00:08:59 2022 -0400
- Reduce peripheral calls in Network app
- Add a manual refresh button instead
+ Fix #48 (shell resolving issue) (#58)
--
2.49.1