cp and mv programs will now accept a directory as the target location and append the original file name automatically in that case

assets/opencomputers/lua/rom/bin/cp.lua

@@ -1,11 +1,18 @@
-local args = shell.parse(...)
+local args, options = shell.parse(...)
 if #args < 2 then
-  print("Usage: cp <from> <to>")
+  print("Usage: cp [-f] <from> <to>")
+  print(" -f: overwrite file if it already exists.")
   return
 end
 
-local from, reason = shell.resolve(args[1])
+local from = shell.resolve(args[1])
-local to, reason = shell.resolve(args[2])
+local to = shell.resolve(args[2])
+if fs.isDirectory(to) then
+  to = to .. "/" .. fs.name(from)
+end
+if fs.exists(to) and not options.f then
+  error("target file exists")
+end
 local result, reason = fs.copy(from, to)
 if not result then
   print(reason)

assets/opencomputers/lua/rom/bin/mv.lua

@@ -1,12 +1,22 @@
-local args = shell.parse(...)
+local args, options = shell.parse(...)
 if #args < 2 then
-  print("Usage: mv <from> <to>")
+  print("Usage: mv [-f] <from> <to>")
+  print(" -f: overwrite file if it already exists.")
   return
 end
 
 local from = shell.resolve(args[1])
 local to = shell.resolve(args[2])
+if fs.isDirectory(to) then
+  to = to .. "/" .. fs.name(from)
+end
+if fs.exists(to) then
+  if not options.f then
+    error("target file exists")
+  end
+  fs.remove(to)
+end
 local result, reason = os.rename(from, to)
 if not result then
-  print(reason)
+  print(reason or "unknown error")
 end

li/cil/oc/server/fs/VirtualFileSystem.scala

@@ -1,6 +1,7 @@
 package li.cil.oc.server.fs
 
 import java.io
+import java.io.FileNotFoundException
 import li.cil.oc.api.fs.Mode
 import net.minecraft.nbt.{NBTTagList, NBTTagCompound}
 import scala.collection.mutable
@@ -62,7 +63,8 @@ trait VirtualFileSystem extends OutputStreamFileSystem {
   }
 
   override def rename(from: String, to: String) =
-    if (from != "" && exists(from) && !exists(to)) {
+    if (from == "" || !exists(from)) throw new FileNotFoundException()
+    else if (!exists(to)) {
       val segmentsTo = segments(to)
       root.get(segmentsTo.dropRight(1)) match {
         case Some(toParent: VirtualDirectory) =>