From 462b264f31aea03544ff47f18bdfea3360e1ae2b Mon Sep 17 00:00:00 2001
From: payonel <payonel@hotmail.com>
Date: Thu, 23 Jun 2016 07:14:16 -0700
Subject: [PATCH] improve /mnt and PS1 conformity

filesystem: don't mount tmpfs in /mnt
shell: remove trailing slash for pwd
ps1: make the default prompt easier to interpret
---
 .../assets/opencomputers/loot/openos/boot/90_filesystem.lua | 2 +-
 .../resources/assets/opencomputers/loot/openos/etc/profile  | 2 +-
 .../assets/opencomputers/loot/openos/lib/shell.lua          | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/assets/opencomputers/loot/openos/boot/90_filesystem.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/90_filesystem.lua
index e59fd53f0..fd64516aa 100644
--- a/src/main/resources/assets/opencomputers/loot/openos/boot/90_filesystem.lua
+++ b/src/main/resources/assets/opencomputers/loot/openos/boot/90_filesystem.lua
@@ -22,7 +22,7 @@ local function onInit()
 end
 
 local function onComponentAdded(_, address, componentType)
-  if componentType == "filesystem" then
+  if componentType == "filesystem" and require("computer").tmpAddress() ~= address then
     local proxy = component.proxy(address)
     if proxy then
       local name = address:sub(1, 3)
diff --git a/src/main/resources/assets/opencomputers/loot/openos/etc/profile b/src/main/resources/assets/opencomputers/loot/openos/etc/profile
index b11d98d5d..7e26dd9d5 100644
--- a/src/main/resources/assets/opencomputers/loot/openos/etc/profile
+++ b/src/main/resources/assets/opencomputers/loot/openos/etc/profile
@@ -17,7 +17,7 @@ set HOME=/home
 set IFS=\ 
 set MANPATH=/usr/man:.
 set PAGER=/bin/more
-set PS1='$PWD# '
+set PS1='$PWD # '
 set PWD=/
 set SHELL=/bin/sh
 set LS_COLORS="{FILE=0xFFFFFF,DIR=0x66CCFF,LINK=0xFFAA00,['*.lua']=0x00FF00}"
diff --git a/src/main/resources/assets/opencomputers/loot/openos/lib/shell.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/shell.lua
index 5db0b4847..c5cefe567 100644
--- a/src/main/resources/assets/opencomputers/loot/openos/lib/shell.lua
+++ b/src/main/resources/assets/opencomputers/loot/openos/lib/shell.lua
@@ -127,13 +127,15 @@ function shell.resolveAlias(command, args)
 end
 
 function shell.getWorkingDirectory()
+  -- if no env PWD default to /
   return os.getenv("PWD") or "/"
 end
 
 function shell.setWorkingDirectory(dir)
   checkArg(1, dir, "string")
-  dir = fs.canonical(dir) .. "/"
-  if dir == "//" then dir = "/" end
+  -- ensure at least /
+  -- and remove trailing /
+  dir = fs.canonical(dir):gsub("^$", "/"):gsub("(.)/$", "%1")
   if fs.isDirectory(dir) then
     os.setenv("PWD", dir)
     return true