[Kindle NT] fix terminal and timesync by mergen3107 · Pull Request #12765 · koreader/koreader

mergen3107 · 2024-11-21T04:21:54Z

Closes #12760
Credits go to @benoit-pierre (Thank you!)

@NiLuJe
Can you please give it a quick glance to make sure Kobo won't suffer from this?

I don't have any other devices to test, so please let me know if there are issues:

newer Kindles?
emulator
Android
Pocketbook
Cervantes
else?

This change is

mergen3107 · 2024-11-21T04:40:05Z

Tested on Kindle 4 NT, all good.

mergen3107 · 2024-11-21T05:31:57Z

Tested again on K4NT, all good

mergen3107 · 2024-11-21T05:32:14Z

Now both ash and sh can be used for terminal emulator shell

forgot to remove the old implementation Co-authored-by: Benoit Pierre <benoit.pierre@gmail.com>

mergen3107 · 2024-11-21T05:49:02Z

First macos check failed ¯\(ツ)/¯

Frenzie · 2024-11-21T08:57:44Z


+function util.isExecutable(file)
+    local attrs = lfs.attributes(file)
+    return attrs and attrs.mode == "file" and os.execute("test -x " .. file) == 0


Note that elsewhere it's written as attr

koreader/frontend/util.lua

Lines 793 to 799 in bb23ed0

local attr = lfs.attributes(path) or {}

if attr.mode == "directory" then

if f ~= "." and f ~= ".." then

scan(path)

end

elseif attr.mode == "file" or attr.mode == "link" then

cb(path, f, attr)

But my actual point, is there a particular reason not to do something like this?

local permissions = attr.permissions return permissions:match("x") ~= nil

The value will look like, for example: rwxr-xr-x

I don't know myself. @benoit-pierre can you please comment on this?

No, this is meaningless without taking into account file ownership and the effective user and group id of the current process.

We have access to access :P. Let me check if if can export the other necessary defines beside F_OK and use that instead.

No, this is meaningless

Emphasis on something like, of course.

Thanks!
I am currently working on GH from web browser, I'll try to make these diffs carefully by hand :D

Done.
Can someone please bump base?
Or please show me show to do it from the browser?

@benoit-pierre

getcwd: cannot access parent directories

Do you think this is because Android, and you have no access to /bin, where from bash is trying to start?
https://stackoverflow.com/questions/29396928/error-retrieving-current-directory-getcwd-cannot-access-parent-directories

Also, Homebrew/brew#9118 (comment)

Bash is actually in /system/xbin/bash on that system. But yeah, I don't know.

mergen3107 · 2024-11-21T18:05:45Z

I synced this branch to prepare for merging.
I hope I didn't break it :D

mergen3107 · 2024-11-22T15:00:59Z

Waiting on one more base-bump with this: koreader/koreader-base#1983 (comment)

Otherwise, ready for review (and merge)

benoit-pierre · 2024-11-22T15:37:55Z

Waiting on one more base-bump with this: koreader/koreader-base#1983 (comment)

There's no need to wait for that since ffi/posix_h.lua is correct.

mergen3107 · 2024-11-22T22:55:48Z

Ready to merge?
I would like to test this on K4NT.

The thing is, I don't have my VM right now, I can't test base changes.
But I can test nightlies :D

NiLuJe

No time to test much of anything right now, but I don't see anything that could cause issues on kobo, at a quick glance.

@benoit-pierre

Closes koreader#12760 Credits go to @benoit-pierre (Thank you!)

mergen3107 added 2 commits November 20, 2024 23:18

terminal emulator - add explicit sh path for older Kindles

ef901b5

Avoid "command" command to support older Kindles too

3ffa201

benoit-pierre reviewed Nov 21, 2024

View reviewed changes

Comment thread plugins/timesync.koplugin/main.lua Outdated

mergen3107 added 3 commits November 20, 2024 23:30

Add which function to util.lua

292140d

Refer to util.which function in Time Sync Plugin

634bb76

Add comments for util.which function in util.lua

7a01061

benoit-pierre reviewed Nov 21, 2024

View reviewed changes

Comment thread frontend/util.lua

mergen3107 added 2 commits November 21, 2024 00:28

Update util.lua with better which function

fc1b455

Update terminal plugin to use better which function

70e64e6

benoit-pierre reviewed Nov 21, 2024

View reviewed changes

Comment thread plugins/terminal.koplugin/main.lua Outdated

Update plugins/terminal.koplugin/main.lua

bb23ed0

forgot to remove the old implementation Co-authored-by: Benoit Pierre <benoit.pierre@gmail.com>

Frenzie reviewed Nov 21, 2024

View reviewed changes

Comment thread plugins/timesync.koplugin/main.lua Outdated

Frenzie reviewed Nov 21, 2024

View reviewed changes

Comment thread plugins/timesync.koplugin/main.lua Outdated

mergen3107 added 2 commits November 21, 2024 11:44

double quotes

9cf4dc6

Merge branch 'koreader:master' into kindle_nt_fix_terminal_and_timesync

a5ecd22

benoit-pierre mentioned this pull request Nov 21, 2024

access bits + util.is executable koreader/koreader-base#1982

Merged

mergen3107 added 2 commits November 21, 2024 14:06

Update util.lua for base PR 1982

f7159f6

Update terminal emulator for base PR 1982

50962c1

hius07 reviewed Nov 22, 2024

View reviewed changes

Comment thread plugins/terminal.koplugin/main.lua Outdated

hius07 reviewed Nov 22, 2024

View reviewed changes

Comment thread plugins/terminal.koplugin/main.lua Outdated

hius07 reviewed Nov 22, 2024

View reviewed changes

Comment thread plugins/timesync.koplugin/main.lua

mergen3107 added 3 commits November 22, 2024 09:45

Update main.lua reorder requirements

fab3ba4

Update main.lua reorder requiremetn and add boolean check

bfa67a2

Update main.lua put C after ffi

fba6d08

Frenzie added this to the 2025.01 milestone Nov 23, 2024

Frenzie reviewed Nov 23, 2024

View reviewed changes

Comment thread plugins/terminal.koplugin/main.lua Outdated

Update plugins/terminal.koplugin/main.lua

c6e803f

Frenzie approved these changes Nov 23, 2024

View reviewed changes

NiLuJe approved these changes Nov 23, 2024

View reviewed changes

Frenzie merged commit e95541f into koreader:master Nov 23, 2024

mergen3107 deleted the kindle_nt_fix_terminal_and_timesync branch November 24, 2024 05:05

0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026

[Kindle NT] fix terminal and timesync (koreader#12765)

a0e407c

Closes koreader#12760 Credits go to @benoit-pierre (Thank you!)

	local attr = lfs.attributes(path) or {}
	if attr.mode == "directory" then
	if f ~= "." and f ~= ".." then
	scan(path)
	end
	elseif attr.mode == "file" or attr.mode == "link" then
	cb(path, f, attr)

Uh oh!

Uh oh!

Conversation

mergen3107 commented Nov 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mergen3107 commented Nov 21, 2024

Uh oh!

Uh oh!

mergen3107 commented Nov 21, 2024

Uh oh!

mergen3107 commented Nov 21, 2024

Uh oh!

Uh oh!

mergen3107 commented Nov 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mergen3107 commented Nov 21, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mergen3107 commented Nov 22, 2024

Uh oh!

benoit-pierre commented Nov 22, 2024

Uh oh!

mergen3107 commented Nov 22, 2024

Uh oh!

Uh oh!

NiLuJe left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mergen3107 commented Nov 21, 2024 •

edited

Loading

mergen3107 commented Nov 21, 2024 •

edited

Loading