Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print zsync2's output on screen #5824

Merged
merged 14 commits into from
Feb 9, 2020
Merged

Print zsync2's output on screen #5824

merged 14 commits into from
Feb 9, 2020

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Feb 6, 2020

Instead of the blind spinner we used to have.

This is a bit of a hack (on both sides), and it currently extends towards the middle of the screen, which means the tail end of it will probably get overwritten by the "Success/Failure" popup.

Can easily be tweaked later, I'd like to get it in as-is to try it for real first ;).

Requires koreader/koreader-base#1038


This change is Reviewable

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 7, 2020

Obligatory screenshot ;). (From a manual run, hence the lack of InfoMessage).

zsync2

@Frenzie Frenzie added this to the 2020.02 milestone Feb 7, 2020
@Frenzie
Copy link
Member

Frenzie commented Feb 7, 2020

Not an issue in busybox?

In platform/common/spinning_zsync line 4:
set -o pipefail
^------^ SC2039: In POSIX sh, set option pipefail is undefined.

For more information:
https://www.shellcheck.net/wiki/SC2039 -- In POSIX sh, set option pipefail ...

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 7, 2020 via email

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 8, 2020

Hmm, appeared in busybox 1.16.0 (2010-01-26), conditional on BASH_COMPAT...

I smell a rat. I'll double-check if it behaves properly for real.

If not, fbink < zsync2 should work instead, right?

@Frenzie
Copy link
Member

Frenzie commented Feb 8, 2020

I'd expect it to anyway. We'll just have to try it. ^_^

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 8, 2020

Kobo: BusyBox v1.22.0.kobo (pipefail works)

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 8, 2020

Kindle 2.5: BusyBox v1.7.2 (2011-01-13 18:01:58 PST) (ouch.)

ash: set: illegal option -o pipefail

Insert Wilhelm scream here

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 8, 2020

Insane shell wizardry incoming!

@NiLuJe NiLuJe merged commit 73659b6 into koreader:master Feb 9, 2020
mwoz123 pushed a commit to mwoz123/koreader that referenced this pull request Mar 29, 2020
* Also remove the temporary files when doing a full retry
* Bump base
  Pickup the required zsync2/FBInk updates
  (koreader/koreader-base#1038)
* Actually does what it says on the tin for Abort
  i.e., cleanup temporary files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants