diff --git a/build/root/install.sh b/build/root/install.sh index 8cb6dcd..d0ca8ca 100644 --- a/build/root/install.sh +++ b/build/root/install.sh @@ -3,6 +3,18 @@ # exit script if return code != 0 set -e +# we cannot build from src currently due to this issue:- https://stackoverflow.com/questions/51027703/mxe-qt5-application-builds-fail-in-docker-container +# we cannot use aur as this is not headless version and also doesnt build (see above). +# we cannot use pacman as qbittorrent could be out of date (pointing at archive) +# we cannot pull packages from aor as this may cause a package mismatch (due to point in time archive) + +# due to the above we are resetting to live repo and using pacman for this app. +echo 'Server = http://mirror.bytemark.co.uk/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist +echo 'Server = http://archlinux.mirrors.uk2.net/$repo/os/$arch' >> /etc/pacman.d/mirrorlist + +# sync package databases for pacman +pacman -Syyu --noconfirm + # build scripts #### @@ -19,7 +31,7 @@ mv /tmp/scripts-master/shell/arch/docker/*.sh /root/ #### # define pacman packages -pacman_packages="base-devel qt5-base qt5-tools qt5-svg boost boost-libs libtorrent-rasterbar python unrar geoip" +pacman_packages="qbittorrent-nox python unrar geoip" # install compiled packages using pacman if [[ ! -z "${pacman_packages}" ]]; then @@ -44,12 +56,6 @@ aur_packages="" # call aur install script (arch user repo) - note true required due to autodl-irssi error during install source /root/aur.sh -# github releases -#### - -# download qbittorrent source -/root/github.sh -df "github-download.zip" -dp "/tmp" -ep "/tmp/extracted" -ip "/opt/qbittorrent" -go "qbittorrent" -gr "qBittorrent" -rt "source" -qt "tags" -cs "cd /opt/qbittorrent && ./configure --disable-gui && make && make install && rm -rf /opt/qbittorrent" - # container perms #### diff --git a/run/nobody/qbittorrent.sh b/run/nobody/qbittorrent.sh index 3dbcb63..e4568cc 100644 --- a/run/nobody/qbittorrent.sh +++ b/run/nobody/qbittorrent.sh @@ -19,9 +19,6 @@ if [[ "${qbittorrent_running}" == "true" ]]; then fi -echo "[info] Removing any qBittorrent session lock files left over from the previous run..." -rm -f /config/qbittorrent/session/*.lock - echo "[info] Attempting to start qBittorrent..." if [[ "${VPN_ENABLED}" == "yes" ]]; then @@ -29,7 +26,7 @@ if [[ "${VPN_ENABLED}" == "yes" ]]; then if [[ "${VPN_PROV}" == "pia" && -n "${VPN_INCOMING_PORT}" ]]; then # run qBittorrent (daemonized, non-blocking), specifying listening interface and port - /usr/bin/qbittorrent-nox --daemon --webui-port=8080 --profile=/config/qbittorrent + /usr/bin/qbittorrent-nox --daemon --webui-port=8080 --profile=/config --relative-fastresume # set qbittorrent port to current vpn port (used when checking for changes on next run) qbittorrent_port="${VPN_INCOMING_PORT}" @@ -37,7 +34,7 @@ if [[ "${VPN_ENABLED}" == "yes" ]]; then else # run qBittorrent (daemonized, non-blocking), specifying listening interface - /usr/bin/qbittorrent-nox --daemon --webui-port=8080 --profile=/config/qbittorrent + /usr/bin/qbittorrent-nox --daemon --webui-port=8080 --profile=/config --relative-fastresume fi @@ -47,7 +44,7 @@ if [[ "${VPN_ENABLED}" == "yes" ]]; then else # run tmux attached to qBittorrent (daemonized, non-blocking) - /usr/bin/qbittorrent-nox --daemon --webui-port=8080 --profile=/config/qbittorrent + /usr/bin/qbittorrent-nox --daemon --webui-port=8080 --profile=/config --relative-fastresume fi diff --git a/run/nobody/watchdog.sh b/run/nobody/watchdog.sh index af2a9fb..bd382a4 100644 --- a/run/nobody/watchdog.sh +++ b/run/nobody/watchdog.sh @@ -51,7 +51,7 @@ while true; do fi # check if qbittorrent is running, if not then skip shutdown of process - if ! pgrep -x "qbittorrent main" > /dev/null; then + if ! pgrep -x "qbittorrent-nox" > /dev/null; then echo "[info] qBittorrent not running" @@ -128,7 +128,7 @@ while true; do else # check if qbittorrent is running, if not then start via qbittorrent.sh - if ! pgrep -x "qbittorrent main" > /dev/null; then + if ! pgrep -x "qbittorrent-nox" > /dev/null; then echo "[info] qBittorrent not running"