Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.15.1 #534

Merged
merged 3 commits into from
Jan 20, 2024
Merged

1.15.1 #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
343f9d7
qbittorrent: 💄Fixes for #526
GilbN Jan 1, 2024
cad7eb4
Unraid: Fix login script github.io URL
GilbN Jan 7, 2024
17fc9c0
Move from subversion to git for pulling the qbittorrent webui (#530)
nintendo424 Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/addons/unraid/login-page/custom_login.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fi
case ${DOMAIN} in
*"github.io"*)
echo "Switching to github.io URL style"
DOMAIN="${DOMAIN}\/theme.park"
DOMAIN="${DOMAIN}/theme.park"
;;
esac

Expand Down
6 changes: 6 additions & 0 deletions css/base/qbittorrent/qbittorrent-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ hr {

.toolbarTabs {
background: var(--transparency-dark-25) !important;
margin: 0px 5px 0 0 !important;
}

.progressbar_dark {
Expand Down Expand Up @@ -662,4 +663,9 @@ select:focus {
.select-watched-folder-editable {
background-color: var(--transparency-dark-05);
border: solid var(--transparency-light-10) 1px;
}

#torrentsFilterToolbar {
float: right;
margin-right: .5rem;
}
1 change: 1 addition & 0 deletions css/base/unraid/unraid-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ pre {

.nav-tile {
background-color: var(--transparency-dark-50);
overflow-x: auto;
}

div.title {
Expand Down
2 changes: 1 addition & 1 deletion docker-mods/qbittorrent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM scratch


LABEL maintainer="GilbN"
LABEL app="Qbittorrent"

#copy local files.
COPY root/ /
22 changes: 11 additions & 11 deletions docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ if [ "${TP_DISABLE_THEME}" = true ]; then
exit 0
fi

if ! [[ -x "$(command -v svn)" ]]; then
if ! [[ -x "$(command -v git)" ]]; then
echo '--------------------------'
echo '| Installing svn package |'
echo '| Installing git package |'
echo '--------------------------'
if [ -x "$(command -v apk)" ]; then
apk update && \
apk add --no-cache subversion
apk add --no-cache git
apk add --no-cache perl
elif [ -x "$(command -v apt-get)" ]; then
apt-get update && \
apt-get install -y subversion
apt-get install -y git
apt-get install -y perl
fi
fi
Expand Down Expand Up @@ -80,15 +80,15 @@ if [[ ! -d /themepark ]]; then
echo '---------------------------------------'
echo '| Downloading WebUI files from github |'
echo '---------------------------------------'
printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
printf '\nDownloading qBittorrent to /temp\n'
git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
printf '\nDownload finished\n\n'
printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
cp -a /temp/. /themepark/public/icons
cp -a /temp/. /themepark/private/icons
cp -a /temp/src/webui/www /themepark
cp -a /temp/src/icons/. /themepark/public/icons
cp -a /temp/src/icons/. /themepark/private/icons
printf '\nCopy finished\n\n'
rm -rf /temp
printf '\nDownload finished\n\n'
printf '\nCleanup finished\n\n'
fi

sed_file(){
Expand Down
4 changes: 2 additions & 2 deletions docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bash

if ! [[ -x "$(command -v svn)" ]]; then
echo "subversion" >> /mod-repo-packages-to-install.list
if ! [[ -x "$(command -v git)" ]]; then
echo "git" >> /mod-repo-packages-to-install.list
echo "perl" >> /mod-repo-packages-to-install.list
fi
14 changes: 7 additions & 7 deletions docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ if [[ ! -d /themepark ]]; then
echo '---------------------------------------'
echo '| Downloading WebUI files from github |'
echo '---------------------------------------'
printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n'
svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark
printf '\nDownloading qBittorrent to /temp\n'
git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp
printf '\nDownload finished\n\n'
printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n'
svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp
cp -a /temp/. /themepark/public/icons
cp -a /temp/. /themepark/private/icons
cp -a /temp/src/webui/www /themepark
cp -a /temp/src/icons/. /themepark/public/icons
cp -a /temp/src/icons/. /themepark/private/icons
printf '\nCopy finished\n\n'
rm -rf /temp
printf '\nDownload finished\n\n'
printf '\nCleanup finished\n\n'
fi

sed_file(){
Expand Down