From 1a4e15b0a64507d9af215ec0178af6a0769120ba Mon Sep 17 00:00:00 2001 From: payonel Date: Tue, 23 May 2017 00:29:35 -0700 Subject: [PATCH] fix ls exit code when piping --- .../resources/assets/opencomputers/loot/openos/bin/ls.lua | 5 ++++- .../assets/opencomputers/loot/openos/boot/02_os.lua | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/openos/bin/ls.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/ls.lua index 39e6a8561..135d2ad5e 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/bin/ls.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/bin/ls.lua @@ -4,7 +4,10 @@ local ok, why = pcall(function(...) return loadfile("/opt/core/full_ls.lua", "bt", _G)(...) end, ...) -if not ok then +if not ok then + if type(why) == "table" and why.code == 0 then + return + end io.stderr:write((why or "") .. "\nFor low memory systems, try using `list` instead\n") return 1 end diff --git a/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua index cacddd419..f9c6acf00 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua @@ -2,7 +2,6 @@ local computer = require("computer") local event = require("event") local fs = require("filesystem") local shell = require("shell") -local unicode = require("unicode") local process = require("process") local function env()