renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OTAManager tar invocations (#4150)

Browse Source 
* Bump base

* Fix tar flag ordering in OTAManager

So that no-recursion actually gets honored, preventing us from creating
extra-large archives with unrelated content...
(Tar started being pickier about flag ordering in a recent version bump).

Fix #4147
Closes #4148 (by superceding it)
This commit is contained in:
NiLuJe
2018-08-10 17:19:50 +02:00
committed by GitHub
parent 637abfdf84
commit d222fe25b6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base

Submodule base updated: ae3e5a7f65...69bae2122e

6
frontend/ui/otamanager.lua
View File

@@ -187,17 +187,17 @@ function OTAManager:_buildLocalPackage()
end
if Device:isAndroid() then
return os.execute(string.format(
"./tar cf %s -T %s --no-recursion",
"./tar --no-recursion -cf %s -T %s",
self.installed_package, self.package_indexfile))
else
-- With visual feedback if supported...
if lfs.attributes("./kotar_cpoint", "mode") == "file" then
return os.execute(string.format(
"./tar cf %s -C .. -T %s --no-recursion --checkpoint=200 --checkpoint-action=exec='./kotar_cpoint $TAR_CHECKPOINT create'",
"./tar --no-recursion -cf %s -C .. -T %s --checkpoint=200 --checkpoint-action=exec='./kotar_cpoint $TAR_CHECKPOINT create'",
self.installed_package, self.package_indexfile))
else
return os.execute(string.format(
"./tar cf %s -C .. -T %s --no-recursion",
"./tar --no-recursion -cf %s -C .. -T %s",
self.installed_package, self.package_indexfile))
end
end