diff options
Diffstat (limited to 'aataaj.lua')
-rwxr-xr-x | aataaj.lua | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -159,24 +159,22 @@ APT.exe = function(c) | |||
159 | I'm getting 7168 or 0. No idea what the fuck that is. | 159 | I'm getting 7168 or 0. No idea what the fuck that is. |
160 | local ok, rslt, status = os.execute(s) | 160 | local ok, rslt, status = os.execute(s) |
161 | ]] | 161 | ]] |
162 | local f = APT.readCmd(self.cmd, 'r') | 162 | local f = APT.readCmd(self.cmd .. '; echo "$?"', 'r') |
163 | -- The last line will be the command's returned status, collect everything else in result. | 163 | -- The last line will be the command's returned status, collect everything else in result. |
164 | self.status = '' -- Otherwise the result starts with 0. | 164 | self.status = tonumber(f[#f]) |
165 | f[#f] = nil | ||
165 | self.result = '\n' | 166 | self.result = '\n' |
166 | self.lines = f | 167 | self.lines = f |
167 | for i,l in ipairs(f) do | 168 | for i,l in ipairs(f) do |
168 | self.result = self.result .. l .. "\n" | 169 | self.result = self.result .. l .. "\n" |
169 | end | 170 | end |
170 | f = APT.readCmd('echo "$?"', 'r') | 171 | if (137 == self.status) or (124 == self.status) then |
171 | for i,l in ipairs(f) do | 172 | print("timeout killed " .. self.status .. ' ' .. self.command) |
172 | self.status = tonumber(l) | 173 | print('ERROR ' .. "timeout killed " .. self.status .. ' ' .. self.command) |
173 | if (137 == self.status) or (124 == self.status) then | 174 | elseif (nil == self.status) then |
174 | print("timeout killed " .. self.status .. ' ' .. self.command) | 175 | print("STATUS |" .. "NIL" .. '| ' .. self.command) |
175 | E("timeout killed " .. self.status .. ' ' .. self.command) | 176 | elseif (0 ~= self.status) then |
176 | elseif (0 ~= self.status) then | 177 | print("STATUS |" .. self.status .. '| ' .. self.command) |
177 | print("status |" .. self.status .. '| ' .. self.command) | ||
178 | E("status |" .. self.status .. '| ' .. self.command) | ||
179 | end | ||
180 | end | 178 | end |
181 | return self | 179 | return self |
182 | end | 180 | end |