Merge pull request #2031 from MageKing17/patch-1

Update ls.tsx
This commit is contained in:
hydroflame 2021-12-19 00:24:58 -05:00 committed by GitHub
commit e6b84a73b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -17,7 +17,7 @@ export function ls(
terminal.error("Incorrect usage of ls command. Usage: ls [dir] [| grep pattern]"); terminal.error("Incorrect usage of ls command. Usage: ls [dir] [| grep pattern]");
} }
if (numArgs > 5 || numArgs === 3) { if (numArgs > 4 || numArgs === 2) {
return incorrectUsage(); return incorrectUsage();
} }
@ -30,12 +30,12 @@ export function ls(
prefix += "/"; prefix += "/";
} }
// If there are 4+ arguments, then the last 3 must be for grep // If there are 3+ arguments, then the last 3 must be for grep
if (numArgs >= 4) { if (numArgs >= 3) {
if (args[numArgs - 1] !== "grep" || args[numArgs - 2] !== "|") { if (args[numArgs - 2] !== "grep" || args[numArgs - 3] !== "|") {
return incorrectUsage(); return incorrectUsage();
} }
filter = args[numArgs] + ""; filter = args[numArgs - 1] + "";
} }
// If the second argument is not a pipe, then it must be for listing a directory // If the second argument is not a pipe, then it must be for listing a directory