diff --git a/kindle/extensions/koreader/bin/koreader-ext.sh b/kindle/extensions/koreader/bin/koreader-ext.sh index cce969904..6c6712cdd 100755 --- a/kindle/extensions/koreader/bin/koreader-ext.sh +++ b/kindle/extensions/koreader/bin/koreader-ext.sh @@ -8,8 +8,8 @@ KOREADER_DIR="/mnt/us/koreader" # Load our helper functions... -if [ -f "${KOREADER_DIR}/libkoreader.inc" ] ; then - source "${KOREADER_DIR}/libkoreader.inc" +if [ -f "${KOREADER_DIR}/libkohelper.sh" ] ; then + source "${KOREADER_DIR}/libkohelper.sh" else echo "Can't source helper functions, aborting!" exit 1 diff --git a/kindle/koreader.sh b/kindle/koreader.sh index 7d803cd3c..bcbf48823 100755 --- a/kindle/koreader.sh +++ b/kindle/koreader.sh @@ -10,8 +10,8 @@ PROC_FIVEWAY="/proc/fiveway" KOREADER_DIR="/mnt/us/koreader" # Load our helper functions... -if [ -f "${KOREADER_DIR}/libkoreader.inc" ] ; then - source "${KOREADER_DIR}/libkoreader.inc" +if [ -f "${KOREADER_DIR}/libkohelper.sh" ] ; then + source "${KOREADER_DIR}/libkohelper.sh" else echo "Can't source helper functions, aborting!" exit 1 @@ -83,10 +83,11 @@ cd "${KOREADER_DIR}" NEWUPDATE="${KOREADER_DIR}/ota/koreader.updated.tar" if [ -f "${NEWUPDATE}" ] ; then logmsg "Updating koreader . . ." - # Look for our own GNU tar build to do a fancy update tracking... + # Look for our own GNU tar build to do a fancy progress tracking... GNUTAR_BIN="${KOREADER_DIR}/tar" if [ -x "${GNUTAR_BIN}" ] ; then - # Let our checkpoint script handle the visual feedback... + # Let our checkpoint script handle the detailed visual feedback... + eips_print_bottom_centered "Updating koreader" 1 ${GNUTAR_BIN} -C "/mnt/us" --checkpoint=200 --checkpoint-action=exec='./kotar_cpoint $TAR_CHECKPOINT' -xf "${NEWUPDATE}" else # Fall back to busybox tar diff --git a/kindle/kotar_cpoint b/kindle/kotar_cpoint index 39779bde2..333fa075a 100755 --- a/kindle/kotar_cpoint +++ b/kindle/kotar_cpoint @@ -4,8 +4,8 @@ KOREADER_DIR="/mnt/us/koreader" # Load our helper functions... -if [ -f "${KOREADER_DIR}/libkoreader.inc" ] ; then - source "${KOREADER_DIR}/libkoreader.inc" +if [ -f "${KOREADER_DIR}/libkohelper.sh" ] ; then + source "${KOREADER_DIR}/libkohelper.sh" else echo "Can't source helper functions, aborting!" exit 1 diff --git a/kindle/libkoreader.inc b/kindle/libkohelper.sh similarity index 95% rename from kindle/libkoreader.inc rename to kindle/libkohelper.sh index 19e5d0bf6..badce3d0b 100644 --- a/kindle/libkoreader.inc +++ b/kindle/libkohelper.sh @@ -1,6 +1,4 @@ #!/bin/sh -# NOTE: KatePart is being stupid, probably because of the file extension. Get me a decent syntax HL anyway. -#kate: syntax bash; ## A bit of helper functions... # Check which type of init system we're running on