Skip to content

Commit

Permalink
1.15.1 (#534)
Browse files Browse the repository at this point in the history
* qbittorrent: 💄Fixes for #526

* Unraid: Fix login script github.io URL
Unraid: Fix the navbar scroll overflow.

* Move from subversion to git for pulling the qbittorrent webui (#530)

* Move from subversion to git for pulling the qbittorrent webui

* slight verbage changes

---------

Co-authored-by: Blake <7227893+nintendo424@users.noreply.github.com>
  • Loading branch information
GilbN and nintendo424 authored Jan 20, 2024
1 parent 6720374 commit 89a556c
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 22 deletions.
2 changes: 1 addition & 1 deletion css/addons/unraid/login-page/custom_login.sh
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
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
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
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
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
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
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

0 comments on commit 89a556c

Please sign in to comment.