WindyMadman/qBittorrent-Enhanced-Edition
1
0
Fork 0
mirror of https://github.com/c0re100/qBittorrent-Enhanced-Edition.git synced 2025-01-08 11:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Delete libtorrent source directory when update failed. fix #380 (#382)

Browse Source
This commit is contained in:
Feng Yu 2022-05-24 21:27:59 +08:00 committed by GitHub
parent 7f2c0ec0e9
commit 4a8c23b666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/build_appimage.sh vendored
View File

@ -35,7 +35,7 @@ echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/0
echo -e 'Acquire::https::Verify-Peer "false";\nAcquire::https::Verify-Host "false";' >/etc/apt/apt.conf.d/99-trust-https
# Since cmake 3.23.0 CMAKE_INSTALL_LIBDIR will force set to lib/<multiarch-tuple> on Debian
echo '/usr/local/lib/x86_64-linux-gnu' > /etc/ld.so.conf.d/x86_64-linux-gnu-local.conf
echo '/usr/local/lib/x86_64-linux-gnu' >/etc/ld.so.conf.d/x86_64-linux-gnu-local.conf
apt update
apt install -y software-properties-common apt-transport-https
@ -274,17 +274,25 @@ fi
# build libtorrent-rasterbar
echo "libtorrent-rasterbar branch: ${LIBTORRENT_BRANCH}"
libtorrent_git_url="https://github.com/arvidn/libtorrent.git"
if [ x"${USE_CHINA_MIRROR}" = x1 ]; then
libtorrent_git_url="https://ghproxy.com/${libtorrent_git_url}"
fi
if [ ! -d "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/" ]; then
libtorrent_git_url="https://github.com/arvidn/libtorrent.git"
if [ x"${USE_CHINA_MIRROR}" = x1 ]; then
libtorrent_git_url="https://ghproxy.com/${libtorrent_git_url}"
fi
retry git clone --depth 1 --recursive --shallow-submodules --branch "${LIBTORRENT_BRANCH}" \
"${libtorrent_git_url}" \
"/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
fi
cd "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
git pull
if ! git pull; then
# if pull failed, retry clone the repository.
cd /
rm -fr "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
retry git clone --depth 1 --recursive --shallow-submodules --branch "${LIBTORRENT_BRANCH}" \
"${libtorrent_git_url}" \
"/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
cd "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
fi
rm -fr build/CMakeCache.txt
cmake \
-B build \

18
.github/workflows/cross_build.sh vendored
View File

@ -340,17 +340,25 @@ prepare_qt() {
prepare_libtorrent() {
echo "libtorrent-rasterbar branch: ${LIBTORRENT_BRANCH}"
libtorrent_git_url="https://github.com/arvidn/libtorrent.git"
if [ x"${USE_CHINA_MIRROR}" = x1 ]; then
libtorrent_git_url="https://ghproxy.com/${libtorrent_git_url}"
fi
if [ ! -d "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/" ]; then
libtorrent_git_url="https://github.com/arvidn/libtorrent.git"
if [ x"${USE_CHINA_MIRROR}" = x1 ]; then
libtorrent_git_url="https://ghproxy.com/${libtorrent_git_url}"
fi
retry git clone --depth 1 --recursive --shallow-submodules --branch "${LIBTORRENT_BRANCH}" \
"${libtorrent_git_url}" \
"/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
fi
cd "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
git pull
if ! git pull; then
# if pull failed, retry clone the repository.
cd /
rm -fr "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
retry git clone --depth 1 --recursive --shallow-submodules --branch "${LIBTORRENT_BRANCH}" \
"${libtorrent_git_url}" \
"/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
cd "/usr/src/libtorrent-rasterbar-${LIBTORRENT_BRANCH}/"
fi
rm -fr build/CMakeCache.txt
# TODO: solve mingw build
if [ x"${TARGET_HOST}" = xWindows ]; then