averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[chore] Deprecate Android OTA code (#4636)

Browse Source 
Fixes #4632.
This commit is contained in:
Frans de Jonge
2019-02-22 12:02:26 +01:00
committed by GitHub
parent b48b0d243f
commit 365a5ad876
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -348,25 +348,6 @@ androidupdate: all
-rm $(ANDROID_LAUNCHER_DIR)/assets/module/koreader-*
# in runtime luajit-launcher's libluajit.so will be loaded
-rm $(INSTALL_DIR)/koreader/libs/libluajit.so
# create zip package
cd $(INSTALL_DIR)/koreader && \
zip -9 -r \
../../koreader-android-$(MACHINE)-$(VERSION).zip \
* -x "resources/fonts/*" "resources/icons/src/*" "spec/*" \
$(ZIP_EXCLUDE)
# generate android update package index file
zipinfo -1 koreader-android-$(MACHINE)-$(VERSION).zip > \
$(INSTALL_DIR)/koreader/ota/package.index
rm -f koreader-android-$(MACHINE)-$(VERSION).zip
echo "ota/package.index" >> $(INSTALL_DIR)/koreader/ota/package.index
cp $(INSTALL_DIR)/koreader/git-rev $(INSTALL_DIR)/koreader/ota-rev
# don't update the git-rev so that the next start won't revert back
# the older 7z version in the assets
$(ISED) '/git-rev/d' $(INSTALL_DIR)/koreader/ota/package.index
# make gzip android update for zsync OTA update
-cd $(INSTALL_DIR)/koreader && \
tar -czah --no-recursion -f ../../koreader-android-$(MACHINE)-$(VERSION).targz \
-T ota/package.index
# make android update apk
cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=1 \
../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \

16
platform/android/llapp_main.lua
View File

@@ -16,22 +16,6 @@ if file ~= nil then
A.LOGI("intent file path " .. file)
end
-- update koreader from ota
local function update()
local new_update = "/sdcard/koreader/ota/koreader.update.tar"
local installed = "/sdcard/koreader/ota/koreader.installed.tar"
local update_file = io.open(new_update, "r")
if update_file ~= nil then
io.close(update_file)
A.showProgress()
if os.execute("tar xf " .. new_update) == 0 then
os.execute("mv " .. new_update .. " " .. installed)
end
A.dismissProgress()
end
end
-- (Disabled, since we hide navbar on start now no need for this hack)
-- run koreader patch before koreader startup
pcall(dofile, "/sdcard/koreader/patch.lua")