From 7b9dced45bfe872d03e00d26b58f8416c6b2ae39 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 4 Jul 2019 18:08:06 +0200 Subject: [PATCH] Don't fork because Debian Buster has Python > 3.5 --- bibliotecha.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/bibliotecha.sh b/bibliotecha.sh index a260840..2c8fade 100755 --- a/bibliotecha.sh +++ b/bibliotecha.sh @@ -315,17 +315,10 @@ function install_calibreweb { $APT_INSTALL_CMD git python3 python3-pip python3-dev python3-venv - # TODO(decentral1se): So, we're temporarily forking calibre-web because we - # ran into https://github.com/janeczku/calibre-web/issues/951. Hopefully this - # is resolved soon and we can continue on the regular upstream - calibre_web_url="https://github.com/decentral1se/calibre-web" - calibre_web_temp_branch="bibliotecha/temp-fork" + calibre_web_url="https://github.com/janeczku/calibre-web" if [ ! -d "$CALIBRE_WEB_PATH" ]; then git clone "$calibre_web_url" "$CALIBRE_WEB_PATH" - cd "$CALIBRE_WEB_PATH" && \ - git fetch origin && \ - git checkout "origin/$calibre_web_temp_branch" fi if [ ! -d "$CALIBRE_WEB_PATH/.venv" ]; then