diff --git a/assets/disk0/tvdos/bin/edit.js b/assets/disk0/tvdos/bin/edit.js index 9016889..dfe9fc2 100644 --- a/assets/disk0/tvdos/bin/edit.js +++ b/assets/disk0/tvdos/bin/edit.js @@ -25,8 +25,6 @@ else { println("File to edit?"); filename = read(); } -let driveLetter = _G.shell.getCurrentDrive(); -let filePath = _G.shell.getPwdString() + filename; let contentChanged = false; @@ -41,7 +39,7 @@ let bulletinShown = false; let cursoringCol = 0; // load existing file if it's there -let file = files.open(`${driveLetter}:/${filePath}`) +let file = files.open(`${_G.shell.resolvePathInput(filename).full}`) let editingExistingFile = file.exists if (editingExistingFile) { textbuffer = file.sread().split("\n") diff --git a/assets/disk0/tvdos/bin/hexdump.js b/assets/disk0/tvdos/bin/hexdump.js index c19eead..454ade2 100644 --- a/assets/disk0/tvdos/bin/hexdump.js +++ b/assets/disk0/tvdos/bin/hexdump.js @@ -13,9 +13,9 @@ else { return 0; } - let file = files.open(`${_G.shell.getCurrentDrive()}:/${_G.shell.resolvePathInput(filename).string}`) + let file = files.open(`${_G.shell.resolvePathInput(filename).full}`) if (!file.exists) { - printerrln(_G.shell.resolvePathInput(filename).string+": cannot open"); + printerrln(file.fullPath+": cannot open"); return 1; } diff --git a/assets/disk0/tvdos/bin/less.js b/assets/disk0/tvdos/bin/less.js index cd9b06f..6375288 100644 --- a/assets/disk0/tvdos/bin/less.js +++ b/assets/disk0/tvdos/bin/less.js @@ -40,7 +40,7 @@ else { let file = files.open(`${_G.shell.resolvePathInput(filename).full}`) if (!file.exists) { - printerrln(_G.shell.resolvePathInput(filename).string+": cannot open"); + printerrln(file.fullPath+": cannot open"); return 1; } diff --git a/assets/disk0/tvdos/bin/printfile.js b/assets/disk0/tvdos/bin/printfile.js index fa2a010..db8896b 100644 --- a/assets/disk0/tvdos/bin/printfile.js +++ b/assets/disk0/tvdos/bin/printfile.js @@ -10,10 +10,8 @@ else { println("File to print out?") filename = read() } -let driveLetter = _G.shell.getCurrentDrive() -let filePath = _G.shell.getPwdString() + filename -let file = files.open(`${driveLetter}:${filePath}`) +let file = files.open(`${_G.shell.resolvePathInput(filename).full}`) if (!file.exists) { printerrln("File not found") diff --git a/assets/disk0/tvdos/bin/touch.js b/assets/disk0/tvdos/bin/touch.js index 40f614a..1fca32b 100644 --- a/assets/disk0/tvdos/bin/touch.js +++ b/assets/disk0/tvdos/bin/touch.js @@ -8,10 +8,8 @@ if (exec_args[1] === undefined) { return 1; } -let path = _G.shell.resolvePathInput(exec_args[2] || exec_args[1]).string; -let driveLetter = _G.shell.getCurrentDrive(); let noNewFile = (exec_args[1] == "/c" || exec_args[1] == "/C"); -let file = files.open(`${driveLetter}:/${path}`) +let file = files.open(`${_G.shell.resolvePathInput(exec_args[2] || exec_args[1]).full}`) if (!file.exists) { printerrln("TOUCH: Can't open "+file.fullPath+" due to IO error"); return 1;