From d222fe25b66d01efb3c4d53b078a5a5039000a96 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Fri, 10 Aug 2018 17:19:50 +0200 Subject: [PATCH] Fix OTAManager tar invocations (#4150) * 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) --- base | 2 +- frontend/ui/otamanager.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base b/base index ae3e5a7f6..69bae2122 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit ae3e5a7f658c414bb2368b3e5fb435d05805081e +Subproject commit 69bae2122eb051ddbd235c5053e54a894e9d96d9 diff --git a/frontend/ui/otamanager.lua b/frontend/ui/otamanager.lua index fa6d03633..144c0d828 100644 --- a/frontend/ui/otamanager.lua +++ b/frontend/ui/otamanager.lua @@ -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