From f38918a6f24bc5f1f89492bca7ef3b33319c0c0d Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Mon, 22 Apr 2019 15:48:40 +0200 Subject: [PATCH] [Ubuntu Touch] Strip OTA update code (#4962) It distracts the developers. ;-) --- Makefile | 12 ------------ platform/ubuntu-touch/koreader.sh | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/Makefile b/Makefile index 0879dceb6..cbd2c1ce3 100644 --- a/Makefile +++ b/Makefile @@ -290,18 +290,6 @@ utupdate: all "koreader/resources/icons/src/*" "koreader/spec/*" \ $(ZIP_EXCLUDE) - # generate update package index file - zipinfo -1 koreader-$(DIST)-$(MACHINE)-$(VERSION).zip > \ - $(INSTALL_DIR)/koreader/ota/package.index - echo "koreader/ota/package.index" >> $(INSTALL_DIR)/koreader/ota/package.index - # update index file in zip package - cd $(INSTALL_DIR) && zip -u ../koreader-$(DIST)-$(MACHINE)-$(VERSION).zip \ - koreader/ota/package.index - # make gzip update for zsync OTA update - cd $(INSTALL_DIR) && \ - tar -czah --no-recursion -f ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \ - -T koreader/ota/package.index - # generate ubuntu touch click package rm -rf $(INSTALL_DIR)/tmp && mkdir -p $(INSTALL_DIR)/tmp cd $(INSTALL_DIR)/tmp && \ diff --git a/platform/ubuntu-touch/koreader.sh b/platform/ubuntu-touch/koreader.sh index 33d958021..7d921ab1b 100755 --- a/platform/ubuntu-touch/koreader.sh +++ b/platform/ubuntu-touch/koreader.sh @@ -4,16 +4,6 @@ export LC_ALL="en_US.UTF-8" # working directory of koreader KOREADER_DIR="${0%/*}" -# update to new version from OTA directory -NEWUPDATE="${KOREADER_DIR}/ota/koreader.updated.tar" -INSTALLED="${KOREADER_DIR}/ota/koreader.installed.tar" -if [ -f "${NEWUPDATE}" ]; then - # TODO: any graphic indication for the updating progress? - cd .. && "${KOREADER_DIR}/tar" xf "${NEWUPDATE}" --no-same-owner --no-same-permissions \ - && mv "${NEWUPDATE}" "${INSTALLED}" - rm -f "${NEWUPDATE}" # always purge newupdate in all cases to prevent update loop -fi - # we're always starting from our working directory cd "${KOREADER_DIR}" || exit