From bf3983a7e29536702507a618bd7fe4364c2cd4a0 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Mon, 10 Dec 2018 10:33:10 -0500
Subject: [PATCH] package cleanup

---
 core/etc/apps/opus-apps.db         | 11 -----------
 core/persist.lua                   | 22 ----------------------
 farms/treefarm.lua                 |  2 +-
 miners/scanningMiner.lua           |  2 +-
 monitor/.package                   |  6 ++++++
 monitor/etc/opus.db                | 13 +++++++++++++
 {core => monitor}/mirror.lua       |  0
 {core => monitor}/mirrorClient.lua |  0
 {core => monitor}/mirrorHost.lua   |  0
 {core => monitor}/mwm.lua          |  0
 {core => monitor}/termShare.lua    |  0
 11 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 core/persist.lua
 create mode 100644 monitor/.package
 create mode 100644 monitor/etc/opus.db
 rename {core => monitor}/mirror.lua (100%)
 rename {core => monitor}/mirrorClient.lua (100%)
 rename {core => monitor}/mirrorHost.lua (100%)
 rename {core => monitor}/mwm.lua (100%)
 rename {core => monitor}/termShare.lua (100%)

diff --git a/core/etc/apps/opus-apps.db b/core/etc/apps/opus-apps.db
index 450301f..d24b2d2 100644
--- a/core/etc/apps/opus-apps.db
+++ b/core/etc/apps/opus-apps.db
@@ -122,15 +122,4 @@ Needs work
 \0300\128\030f\159\129\138\0300\031f\143\149\030f\0310\134",
     run = "https://pastebin.com/raw/jyDH7mLH",
   },
-  [ "58ec8d6e36e346d9f42eb43935652e3e58e2c829" ] = {
-    title = "Mwm",
-    category = "Apps",
-    icon = "\030f\031f      \0304 \
-\030f\031dshell]\0304\0314 \
-\0304\031f       ",
-    iconExt = "\030 \031f\0305\031f\155\030f\128\031d\152\140\030d\031f\151\030f\128\128\0304\0314\128\
-\030 \031f\030f\0315\152\129\030d\031f\141\030f\031d\153\030d\031f\149\030f\031d\131\148\0304\0314\128\
-\030 \031f\0304\031f\131\131\131\131\131\131\131\030e\0314\131",
-    run = "mwm.lua usr/config/mwm",
-  },
 }
diff --git a/core/persist.lua b/core/persist.lua
deleted file mode 100644
index 2c85f0e..0000000
--- a/core/persist.lua
+++ /dev/null
@@ -1,22 +0,0 @@
--- saves a virtual file to disk
-
-_G.requireInjector(_ENV)
-
-local Util = require('util')
-
-local fs    = _G.fs
-local shell = _ENV.shell
-
-local args = { ... }
-local fileName = args[1] and
-                 shell.resolve(args[1]) or
-                 error('Syntax: persist <file name>')
-
-local c = Util.readFile(fileName) or error('Unable to read file')
-
--- ensure it is writable - if not an error is thrown
-Util.writeFile(fileName, '')
-fs.delete(fileName)
-Util.writeFile(fileName, c)
-
-print('Saved')
diff --git a/farms/treefarm.lua b/farms/treefarm.lua
index 8bf9040..781ac81 100644
--- a/farms/treefarm.lua
+++ b/farms/treefarm.lua
@@ -1,4 +1,4 @@
-_G.requireInjector()
+_G.requireInjector(_ENV)
 
 --[[
   Requirements:
diff --git a/miners/scanningMiner.lua b/miners/scanningMiner.lua
index 2feb7fd..c2f259f 100644
--- a/miners/scanningMiner.lua
+++ b/miners/scanningMiner.lua
@@ -31,7 +31,7 @@ local options = {
   chunks      = { arg = 'c', type = 'number', value = -1,
                  desc = 'Number of chunks to mine' },
   setTrash    = { arg = 's', type = 'flag',   value = false,
-                 desc = 'Set trash items' },
+                 desc = 'Add ignore items' },
   help        = { arg = 'h', type = 'flag',   value = false,
                  desc = 'Displays the options' },
 }
diff --git a/monitor/.package b/monitor/.package
new file mode 100644
index 0000000..f993c05
--- /dev/null
+++ b/monitor/.package
@@ -0,0 +1,6 @@
+{
+	title = 'Various monitor related programs',
+	repository = 'kepler155c/opus-apps/{{OPUS_BRANCH}}/monitor',
+	description = [[Mirror terminal to monitor, Monitor Window Manager (mwm), and more]],
+	licence = 'MIT',
+}
diff --git a/monitor/etc/opus.db b/monitor/etc/opus.db
new file mode 100644
index 0000000..d1dbdb3
--- /dev/null
+++ b/monitor/etc/opus.db
@@ -0,0 +1,13 @@
+{
+  [ "58ec8d6e36e346d9f42eb43935652e3e58e2c829" ] = {
+    title = "Mwm",
+    category = "Apps",
+    icon = "\030f\031f      \0304 \
+\030f\031dshell]\0304\0314 \
+\0304\031f       ",
+    iconExt = "\030 \031f\0305\031f\155\030f\128\031d\152\140\030d\031f\151\030f\128\128\0304\0314\128\
+\030 \031f\030f\0315\152\129\030d\031f\141\030f\031d\153\030d\031f\149\030f\031d\131\148\0304\0314\128\
+\030 \031f\0304\031f\131\131\131\131\131\131\131\030e\0314\131",
+    run = "mwm.lua usr/config/mwm",
+  },
+}
diff --git a/core/mirror.lua b/monitor/mirror.lua
similarity index 100%
rename from core/mirror.lua
rename to monitor/mirror.lua
diff --git a/core/mirrorClient.lua b/monitor/mirrorClient.lua
similarity index 100%
rename from core/mirrorClient.lua
rename to monitor/mirrorClient.lua
diff --git a/core/mirrorHost.lua b/monitor/mirrorHost.lua
similarity index 100%
rename from core/mirrorHost.lua
rename to monitor/mirrorHost.lua
diff --git a/core/mwm.lua b/monitor/mwm.lua
similarity index 100%
rename from core/mwm.lua
rename to monitor/mwm.lua
diff --git a/core/termShare.lua b/monitor/termShare.lua
similarity index 100%
rename from core/termShare.lua
rename to monitor/termShare.lua