From d0763262734bdf19d7d763c507eb46481e566069 Mon Sep 17 00:00:00 2001
From: kepler155c <kepler155c@gmail.com>
Date: Tue, 20 Nov 2018 20:54:25 -0500
Subject: [PATCH] prep for release

---
 core/Script.lua            |  4 ++--
 core/Turtles.lua           |  2 +-
 core/etc/apps/opus-apps.db | 25 ++++++++-----------------
 miners/etc/apps/apps.db    | 11 +++++++++++
 4 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 miners/etc/apps/apps.db

diff --git a/core/Script.lua b/core/Script.lua
index 20c72f5..82e0b30 100644
--- a/core/Script.lua
+++ b/core/Script.lua
@@ -11,8 +11,8 @@ local fs         = _G.fs
 local os         = _G.os
 local shell      = _ENV.shell
 
-local GROUPS_PATH = 'usr/groups'
-local SCRIPTS_PATH = 'usr/etc/scripts'
+local GROUPS_PATH = 'usr/config/groups'
+local SCRIPTS_PATH = 'packages/core/etc/scripts'
 
 UI:configure('script', ...)
 
diff --git a/core/Turtles.lua b/core/Turtles.lua
index a91fd32..6ce66f6 100644
--- a/core/Turtles.lua
+++ b/core/Turtles.lua
@@ -31,7 +31,7 @@ local options = {
                  desc = 'Displays the options' },
 }
 
-local SCRIPTS_PATH = 'usr/etc/scripts'
+local SCRIPTS_PATH = 'packages/core/etc/scripts'
 
 local nullTerm = Terminal.getNullTerm(term.current())
 local socket
diff --git a/core/etc/apps/opus-apps.db b/core/etc/apps/opus-apps.db
index cd82806..952d632 100644
--- a/core/etc/apps/opus-apps.db
+++ b/core/etc/apps/opus-apps.db
@@ -1,4 +1,6 @@
 {
+--[[
+Needs work
   [ "90ef98d4b6fd15466f0a1f212ec1db8d9ebe018c" ] = {
     title = "Turtles",
     category = "Apps",
@@ -10,8 +12,6 @@
 \030 \031f\030f\031f\128\0317\143\031f\128\128\0317\143\031f\128\128\128",
     run = "Turtles.lua",
   },
---[[
-Needs work
   [ "381e3298b2b8f6caeb2208b57d805ada38402f0b" ] = {
     title = "Scripts",
     category = "Apps",
@@ -57,15 +57,6 @@ Needs work
     requires = 'turtle',
   },
 --[[
-  [ "4486006f811b88cacd5f211fd579717e29b600cd" ] = {
-    title = "Miner",
-    category = "Apps",
-    icon = "    \0315\\\030 \031  \
- \0304\031f _ \030 \031c/\0315\\\
- \0304   ",
-    run = "simpleMiner.lua",
-    requires = 'turtle',
-  },
   [ "89307d419a2fe4fbb69af92b3d3af27b6ec14d3e" ] = {
     title = "Telnet",
     category = "Apps",
@@ -91,6 +82,12 @@ Needs work
     run = "usr/apps/builder.lua",
     requires = "turtle",
   },
+  [ "d8c298dd41e4a4ec20e8307901797b64688b3b77" ] = {
+    title = "GPS Deploy",
+    category = "Apps",
+    run = "http://pastebin.com/raw/VXAyXqBv",
+    requires = "turtle",
+  },
 --]]
   df485c871329671f46570634d63216761441bcd6 = {
     title = "Devices",
@@ -114,12 +111,6 @@ Needs work
 \030 \031f\030f\031e\139\030e\128\030f\159\129\0314\130\131\131\129",
     run = "recorder.lua",
   },
-  [ "d8c298dd41e4a4ec20e8307901797b64688b3b77" ] = {
-    title = "GPS Deploy",
-    category = "Apps",
-    run = "http://pastebin.com/raw/VXAyXqBv",
-    requires = "turtle",
-  },
   [ "a2accffe95b2c8be30e8a05e0c6ab7e8f5966f43" ] = {
     title = "Strafe",
     category = "Games",
diff --git a/miners/etc/apps/apps.db b/miners/etc/apps/apps.db
new file mode 100644
index 0000000..a9ea75e
--- /dev/null
+++ b/miners/etc/apps/apps.db
@@ -0,0 +1,11 @@
+{
+	[ "4486006f811b88cacd5f211fd579717e29b600cd" ] = {
+		title = "Miner",
+		category = "Apps",
+		icon = "    \0315\\\030 \031  \
+ \0304\031f _ \030 \031c/\0315\\\
+ \0304   ",
+		run = "simpleMiner.lua",
+		requires = 'turtle',
+	},
+}