From eaf2b0cf8a6f0dbbfd7a553b5c25dd0cc698f6ba Mon Sep 17 00:00:00 2001 From: payonel Date: Fri, 8 Sep 2017 00:49:50 -0700 Subject: [PATCH] ignore the robot magic filesystem with install, and small /bin/sleep fix /bin/sleep ^c was printing an error because it was returning the event data, which prompts was interpretting as error details [unexpected] use a .prop file to have the robot component magic fs be ignored when running `install` --- .../resources/assets/opencomputers/loot/openos/bin/sleep.lua | 4 ++-- .../resources/assets/opencomputers/lua/component/robot/.prop | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/opencomputers/lua/component/robot/.prop diff --git a/src/main/resources/assets/opencomputers/loot/openos/bin/sleep.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/sleep.lua index b7c682233..f8091f2fa 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/bin/sleep.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/bin/sleep.lua @@ -53,7 +53,7 @@ end local stdin_stream = io.stdin.stream if stdin_stream.pull then - return stdin_stream:pull(nil, total_time, "interrupted") + stdin_stream:pull(nil, total_time, "interrupted") else - os.sleep(total_time) + require("event").pull(total_time, "interrupted") end diff --git a/src/main/resources/assets/opencomputers/lua/component/robot/.prop b/src/main/resources/assets/opencomputers/lua/component/robot/.prop new file mode 100644 index 000000000..57d53fa41 --- /dev/null +++ b/src/main/resources/assets/opencomputers/lua/component/robot/.prop @@ -0,0 +1 @@ +{ignore=true}