reorganization

sys/etc/app.db

@@ -103,7 +103,7 @@
     icon = "\030f     \
 \030f\0310lua>\031  \
 \030f     ",
-    run = "Lua.lua",
+    run = "sys/apps/Lua.lua",
   },
   [ "89307d419a2fe4fbb69af92b3d3af27b6ec14d3e" ] = {
     title = "Telnet",
@@ -177,14 +177,6 @@
  \031e\\/\031  \0319c",
     run = "vnc.lua",
   },
-  [ "4759bf14d7a511508e86c343c934894b6e8db533" ] = {
-    title = "Builder",
-    category = "Apps",
-    icon = "\0317_____\
-\030e\031c###\0308\0317=\030e\031c#\
-\030e\031c#\0307\031f.\030e\031c###",
-    run = "builder.lua",
-  },
   [ "6ce6c512ea433a7fc5c8841628e7696cd0ff7f2b" ] = {
     title = "Files",
     category = "Apps",
@@ -217,4 +209,36 @@
 \0304 \030f    \030  ",
     run = "shell",
   },
+  [ "131f0b008f44298812221d120d982940609be781" ] = {
+    title = "Builder",
+    category = "Apps",
+    icon = "\0317_____\
+\030e\031c###\0308\0317=\030e\031c#\
+\030e\031c#\0307\031f.\030e\031c###",
+    run = "usr/apps/builder.lua",
+  },
+  [ "d8c298dd41e4a4ec20e8307901797b64688b3b77" ] = {
+    title = "GPS Deploy",
+    category = "Apps",
+    run = "http://pastebin.com/raw/qLthLak5",
+    requires = "turtle",
+  },
+  [ "53a5d150062b1e03206b9e15854b81060e3c7552" ] = {
+    apptype = "url",
+    title = "Minesweeper",
+    category = "Games",
+    run = "http://pastebin.com/raw/nsKrHTbN",
+  },
+  [ "8d59207c8a84153b3e9f035cc3b6ec7a23671323" ] = {
+    apptype = "url",
+    title = "Micropaint",
+    category = "Apps",
+    run = "http://pastebin.com/raw/tMRzJXx2",
+  },
+  [ "d78f28759f255a0db76604ee560b87c4715a0da5" ] = {
+    apptype = "url",
+    title = "Sketch",
+    category = "Apps",
+    run = "http://pastebin.com/raw/Mm5hd97E",
+  },
 }

sys/etc/fstab

@@ -1,4 +0,0 @@
-sys/apps/gpsdeploy urlfs http://pastebin.com/raw/qLthLak5
-sys/apps/Minesweeper urlfs http://pastebin.com/raw/nsKrHTbN
-sys/apps/Micropaint urlfs http://pastebin.com/raw/tMRzJXx2
-sys/apps/sketch urlfs http://pastebin.com/raw/Mm5hd97E

sys/etc/scripts/obsidian

@@ -28,7 +28,7 @@ local function findObsidian()
 
     local _,b = turtle.inspectDown()
     if b and (b.name == 'minecraft:lava' or b.name == 'minecraft:flowing_lava') then
-      if turtle.selectSlot('minecraft:water_bucket') then
+      if turtle.select('minecraft:water_bucket') then
         while true do
           if turtle.up() then
             break
@@ -84,7 +84,7 @@ local s, m = turtle.run(function()
     end
 
     findObsidian()
-    if not turtle.selectSlot('minecraft:water_bucket') then
+    if not turtle.select('minecraft:water_bucket') then
       break
     end
     turtle.goto(0, 0)