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.

Sign up for GitHub

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

Jump to bottom

Avoid include directories in package.index #4148

Closed
wants to merge 2 commits into from
Closed

Avoid include directories in package.index #4148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8f04d
Avoid include directories in package.index
Hzj-jie Aug 9, 2018
2a4f3f5
Remove no-recursion flag of tar
Hzj-jie Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -176,7 +176,7 @@ kindleupdate: all
"koreader/resources/icons/src/*" "koreader/spec/*" \
$(ZIP_EXCLUDE)
# generate kindleupdate package index file
zipinfo -1 koreader-$(DIST)-$(MACHINE)-$(VERSION).zip > \
zipinfo -1 koreader-$(DIST)-$(MACHINE)-$(VERSION).zip | grep -v '/$' > \
$(INSTALL_DIR)/koreader/ota/package.index
echo "koreader/ota/package.index" >> $(INSTALL_DIR)/koreader/ota/package.index
# update index file in zip package
Expand Down
6 changes: 3 additions & 3 deletions frontend/ui/otamanager.lua
View file
Open in desktop
Expand Up @@ -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 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 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 cf %s -C .. -T %s",
self.installed_package, self.package_indexfile))
end
end
Expand Down