From 41bb9731497e25fbcad6faa7380db6606ec47f08 Mon Sep 17 00:00:00 2001 From: GilbN Date: Tue, 15 Aug 2023 09:01:57 +0000 Subject: [PATCH] deploy: 06a287ef0c5ebaba55ffef62c817e71cfb8d5708 --- .github/workflows/auto-build.yml | 96 ++++++++++--------- css/base/gitea/aquamarine.css | 2 +- css/base/gitea/blackberry-abyss.css | 2 +- css/base/gitea/blackberry-amethyst.css | 2 +- css/base/gitea/blackberry-carol.css | 2 +- css/base/gitea/blackberry-dreamscape.css | 2 +- css/base/gitea/blackberry-flamingo.css | 2 +- css/base/gitea/blackberry-hearth.css | 2 +- css/base/gitea/blackberry-martian.css | 2 +- css/base/gitea/blackberry-pumpkin.css | 2 +- css/base/gitea/blackberry-royal.css | 2 +- css/base/gitea/blackberry-shadow.css | 2 +- css/base/gitea/blackberry-solar.css | 2 +- css/base/gitea/blackberry-vanta.css | 2 +- css/base/gitea/dark.css | 2 +- css/base/gitea/dracula.css | 2 +- css/base/gitea/gitea-base.css | 6 +- css/base/gitea/hotline-old.css | 2 +- css/base/gitea/hotline.css | 2 +- css/base/gitea/hotpink.css | 2 +- css/base/gitea/ibracorp.css | 2 +- css/base/gitea/maroon.css | 2 +- css/base/gitea/mind.css | 2 +- css/base/gitea/nord.css | 2 +- css/base/gitea/onedark.css | 2 +- css/base/gitea/organizr.css | 2 +- css/base/gitea/overseerr.css | 2 +- css/base/gitea/pine-shadow.css | 2 +- css/base/gitea/plex.css | 2 +- css/base/gitea/power.css | 2 +- css/base/gitea/reality.css | 2 +- css/base/gitea/soul.css | 2 +- css/base/gitea/space-gray.css | 2 +- css/base/gitea/space.css | 2 +- css/base/gitea/time.css | 2 +- css/base/gitea/trueblack.css | 2 +- .../lidarr/root/etc/cont-init.d/98-themepark | 20 ++-- .../s6-overlay/s6-rc.d/init-mod-themepark/run | 20 ++-- .../root/etc/cont-init.d/98-themepark | 20 ++-- .../s6-overlay/s6-rc.d/init-mod-themepark/run | 20 ++-- .../radarr/root/etc/cont-init.d/98-themepark | 20 ++-- .../s6-overlay/s6-rc.d/init-mod-themepark/run | 20 ++-- .../readarr/root/etc/cont-init.d/98-themepark | 18 ++-- .../s6-overlay/s6-rc.d/init-mod-themepark/run | 18 ++-- .../sonarr/root/etc/cont-init.d/98-themepark | 20 ++-- .../s6-overlay/s6-rc.d/init-mod-themepark/run | 20 ++-- .../root/etc/cont-init.d/98-themepark | 20 ++-- .../s6-overlay/s6-rc.d/init-mod-themepark/run | 20 ++-- themes.json | 74 +++++++------- 49 files changed, 268 insertions(+), 212 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 1a2287b9..05d4595c 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -3,8 +3,10 @@ on: push: branches: - master + - develop + - testing paths: - - 'docker-mods/**' + - '**/docker-mods/**' workflow_dispatch: inputs: app: @@ -43,6 +45,7 @@ on: append-tag: required: false description: 'Append a the tag with "-custom" e.g :radarr-testing' + jobs: push_to_ghcr_io: runs-on: ubuntu-latest @@ -51,46 +54,47 @@ jobs: uses: actions/checkout@v3.1.0 with: fetch-depth: 0 - - name: get changed files - id: getfile - run: | - echo "files=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} docker-mods/| xargs)" >> $GITHUB_ENV - name: Login to GitHub Container Registry uses: docker/login-action@v2.1.0 with: registry: ghcr.io - username: ${{ github.repository_owner }} + username: ${{ secrets.GHCR_USER }} password: ${{ secrets.GH_PAT }} - - name: find correct directory then build&push + - name: Extract branch name + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + id: extract_branch + - name: build all on push if: ${{ github.event_name == 'push' }} run: | - for i in ${{ env.files }} - do - directory="$( echo $i | cut -d'/' -f2 -s )" - if [ -z "$directory" ]; then - continue # Skip root dir - elif [ "$i" == *.md ]; then - continue # Skip markdown files - elif [ "$i" == *.yml ]; then - continue # Skip YAML files - fi - docker build docker-mods/$directory --tag ghcr.io/gilbn/theme.park:$directory - docker push ghcr.io/gilbn/theme.park:$directory - done + branch=${{ steps.extract_branch.outputs.branch }} + + if [ "$branch" = "master" ]; then + branch="" + else + branch="-$branch" + fi + for dir in docker-mods/*; + do + app="$( echo "$dir" | cut -d'/' -f2 -s )" + docker build docker-mods/$app --tag ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app$branch + docker push ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app$branch + done - name: manually build if: ${{ github.event.inputs.app && github.event.inputs.app != 'build-all-the-mods' }} run: | - docker build docker-mods/${{ github.event.inputs.app }} --tag ghcr.io/gilbn/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} - docker push ghcr.io/gilbn/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} + docker build docker-mods/${{ github.event.inputs.app }} --tag ghcr.io/${{ secrets.GHCR_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} + docker push ghcr.io/${{ secrets.GHCR_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} - name: manually build all mods if: ${{ github.event.inputs.app == 'build-all-the-mods' }} run: | for dir in docker-mods/*; do app="$( echo "$dir" | cut -d'/' -f2 -s )" - docker build docker-mods/$app --tag ghcr.io/gilbn/theme.park:$app${{ github.event.inputs.append-tag }} - docker push ghcr.io/gilbn/theme.park:$app${{ github.event.inputs.append-tag }} + docker build docker-mods/$app --tag ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} + docker push ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} done + push_to_dockerhub: runs-on: ubuntu-latest steps: @@ -98,42 +102,42 @@ jobs: uses: actions/checkout@v3.1.0 with: fetch-depth: 0 - - name: get changed files - id: getfile - run: | - echo "files=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} docker-mods/| xargs)" >> $GITHUB_ENV - name: Login to Docker Hub uses: docker/login-action@v2.1.0 with: username: ${{ secrets.DH_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: find correct directory then build&push + - name: Extract branch name + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + id: extract_branch + - name: build all on push if: ${{ github.event_name == 'push' }} run: | - for i in ${{ env.files }} - do - directory="$( echo $i | cut -d'/' -f2 -s )" - if [ -z "$directory" ]; then - continue # Skip root dir - elif [ "$i" == *.md ]; then - continue # Skip markdown files - elif [ "$i" == *.yml ]; then - continue # Skip YAML files - fi - docker build docker-mods/$directory --tag gilbn/theme.park:$directory - docker push gilbn/theme.park:$directory - done + branch=${{ steps.extract_branch.outputs.branch }} + + if [ "$branch" = "master" ]; then + branch="" + else + branch="-$branch" + fi + for dir in docker-mods/*; + do + app="$( echo "$dir" | cut -d'/' -f2 -s )" + docker build docker-mods/$app --tag ${{ secrets.DH_USER }}/theme.park:$app$branch + docker push ${{ secrets.DH_USER }}/theme.park:$app$branch + done - name: manually build if: ${{ github.event.inputs.app && github.event.inputs.app != 'build-all-the-mods' }} run: | - docker build docker-mods/${{ github.event.inputs.app }} --tag gilbn/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} - docker push gilbn/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} + docker build docker-mods/${{ github.event.inputs.app }} --tag ${{ secrets.DH_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} + docker push ${{ secrets.DH_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} - name: manually build all mods if: ${{ github.event.inputs.app == 'build-all-the-mods' }} run: | for dir in docker-mods/*; do app="$( echo "$dir" | cut -d'/' -f2 -s )" - docker build docker-mods/$app --tag gilbn/theme.park:$app${{ github.event.inputs.append-tag }} - docker push gilbn/theme.park:$app${{ github.event.inputs.append-tag }} + docker build docker-mods/$app --tag ${{ secrets.DH_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} + docker push ${{ secrets.DH_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} done diff --git a/css/base/gitea/aquamarine.css b/css/base/gitea/aquamarine.css index 518485e0..dff39134 100644 --- a/css/base/gitea/aquamarine.css +++ b/css/base/gitea/aquamarine.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/aquamarine.css?sha=d756574a59cc3bfa2433998efaf57bf3"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-abyss.css b/css/base/gitea/blackberry-abyss.css index 1e444e73..f07047e1 100644 --- a/css/base/gitea/blackberry-abyss.css +++ b/css/base/gitea/blackberry-abyss.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-abyss.css?sha=e8399c6f8a2e9f3ec99f9aad936db7a9"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-amethyst.css b/css/base/gitea/blackberry-amethyst.css index 35e4dbd2..7fb97110 100644 --- a/css/base/gitea/blackberry-amethyst.css +++ b/css/base/gitea/blackberry-amethyst.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-amethyst.css?sha=87786d9451286f37b81293bbf51a8205"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-carol.css b/css/base/gitea/blackberry-carol.css index 3680e6e1..7c1a1f9f 100644 --- a/css/base/gitea/blackberry-carol.css +++ b/css/base/gitea/blackberry-carol.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-carol.css?sha=dd744035926663fc42242daedc9f1794"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-dreamscape.css b/css/base/gitea/blackberry-dreamscape.css index cd2286b9..863d1bae 100644 --- a/css/base/gitea/blackberry-dreamscape.css +++ b/css/base/gitea/blackberry-dreamscape.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-dreamscape.css?sha=81a988c1ccc397ca303b898a69b8933f"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-flamingo.css b/css/base/gitea/blackberry-flamingo.css index b613c8bc..48b5455d 100644 --- a/css/base/gitea/blackberry-flamingo.css +++ b/css/base/gitea/blackberry-flamingo.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-flamingo.css?sha=1f73a7b422a1ad484a33b95e71e542d7"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-hearth.css b/css/base/gitea/blackberry-hearth.css index 184d4a7d..93f613f5 100644 --- a/css/base/gitea/blackberry-hearth.css +++ b/css/base/gitea/blackberry-hearth.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-hearth.css?sha=63eff67e0507c9f40b3a6d721fd2e00b"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-martian.css b/css/base/gitea/blackberry-martian.css index b2bf4ee3..45be9e24 100644 --- a/css/base/gitea/blackberry-martian.css +++ b/css/base/gitea/blackberry-martian.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-martian.css?sha=b147b481a6e52a58dccff4ff3e2b83a0"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-pumpkin.css b/css/base/gitea/blackberry-pumpkin.css index 1f08d16c..4b55b600 100644 --- a/css/base/gitea/blackberry-pumpkin.css +++ b/css/base/gitea/blackberry-pumpkin.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-pumpkin.css?sha=ded53ed23d3bb1b293c2b444f9c6b520"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-royal.css b/css/base/gitea/blackberry-royal.css index 2d051283..fc8cba40 100644 --- a/css/base/gitea/blackberry-royal.css +++ b/css/base/gitea/blackberry-royal.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-royal.css?sha=5656c5c4f467941883374376d45a8758"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-shadow.css b/css/base/gitea/blackberry-shadow.css index 406d112b..8d69e84c 100644 --- a/css/base/gitea/blackberry-shadow.css +++ b/css/base/gitea/blackberry-shadow.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-shadow.css?sha=b8941bbed98a08998a2fbe28319112c0"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-solar.css b/css/base/gitea/blackberry-solar.css index 44b9e401..c09bc5dc 100644 --- a/css/base/gitea/blackberry-solar.css +++ b/css/base/gitea/blackberry-solar.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-solar.css?sha=b993845b73c14914d185a76b44750c64"); \ No newline at end of file diff --git a/css/base/gitea/blackberry-vanta.css b/css/base/gitea/blackberry-vanta.css index f9960654..7a5a879b 100644 --- a/css/base/gitea/blackberry-vanta.css +++ b/css/base/gitea/blackberry-vanta.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/blackberry-vanta.css?sha=66ca6a0d6a5055bc0a2a0460c945fa7a"); \ No newline at end of file diff --git a/css/base/gitea/dark.css b/css/base/gitea/dark.css index 1e996a80..5d768b3c 100644 --- a/css/base/gitea/dark.css +++ b/css/base/gitea/dark.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/dark.css?sha=1bbea8b71216f2c2b7eff31ee72c389f"); \ No newline at end of file diff --git a/css/base/gitea/dracula.css b/css/base/gitea/dracula.css index 63dc0d39..88bbb6ef 100644 --- a/css/base/gitea/dracula.css +++ b/css/base/gitea/dracula.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/dracula.css?sha=6366d3845240fb8943c2b54d56335a19"); \ No newline at end of file diff --git a/css/base/gitea/gitea-base.css b/css/base/gitea/gitea-base.css index 9f43e61c..19fc2129 100644 --- a/css/base/gitea/gitea-base.css +++ b/css/base/gitea/gitea-base.css @@ -24,7 +24,11 @@ --color-primary: rgb(var(--gitea-color-primary-dark-4),.6); --color-primary-dark-2: rgb(var(--gitea-color-primary-dark-4),.8); --color-primary-dark-4: rgb(var(--gitea-color-primary-dark-4)); - } + --color-nav-bg: var(--main-bg-color); + --color-button: transparent; + --color-menu: transparent; + --color-footer: transparent; +} body { background: var(--main-bg-color); diff --git a/css/base/gitea/hotline-old.css b/css/base/gitea/hotline-old.css index db0ec8c9..2bd7742d 100644 --- a/css/base/gitea/hotline-old.css +++ b/css/base/gitea/hotline-old.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/hotline-old.css?sha=1996bf028fd671f9a43dc15035e65c33"); \ No newline at end of file diff --git a/css/base/gitea/hotline.css b/css/base/gitea/hotline.css index 0187cf40..15bee626 100644 --- a/css/base/gitea/hotline.css +++ b/css/base/gitea/hotline.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/hotline.css?sha=b104dcbd717283d00fe6de4219744ecc"); \ No newline at end of file diff --git a/css/base/gitea/hotpink.css b/css/base/gitea/hotpink.css index f9e2169e..5a2497bd 100644 --- a/css/base/gitea/hotpink.css +++ b/css/base/gitea/hotpink.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/hotpink.css?sha=152a8bd511ff5cfe5df90e00688ba1fc"); \ No newline at end of file diff --git a/css/base/gitea/ibracorp.css b/css/base/gitea/ibracorp.css index 3b69df91..8eaf94f6 100644 --- a/css/base/gitea/ibracorp.css +++ b/css/base/gitea/ibracorp.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/ibracorp.css?sha=c614a1a123a048850289e718fd113c8f"); \ No newline at end of file diff --git a/css/base/gitea/maroon.css b/css/base/gitea/maroon.css index d26068c4..fd205658 100644 --- a/css/base/gitea/maroon.css +++ b/css/base/gitea/maroon.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/maroon.css?sha=aba3461aac201e257cf5cea12d9f6c5c"); \ No newline at end of file diff --git a/css/base/gitea/mind.css b/css/base/gitea/mind.css index cb0dd44c..0c2909ae 100644 --- a/css/base/gitea/mind.css +++ b/css/base/gitea/mind.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/mind.css?sha=9f02ff1636bb19fbbc1c883f0a69814d"); \ No newline at end of file diff --git a/css/base/gitea/nord.css b/css/base/gitea/nord.css index 341c891c..ceb184c1 100644 --- a/css/base/gitea/nord.css +++ b/css/base/gitea/nord.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/nord.css?sha=1b026fc9951acb87776302d71db5705e"); \ No newline at end of file diff --git a/css/base/gitea/onedark.css b/css/base/gitea/onedark.css index dc20b52b..f696365b 100644 --- a/css/base/gitea/onedark.css +++ b/css/base/gitea/onedark.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/onedark.css?sha=35d1229e080c54d138ea4c9512c0f0db"); \ No newline at end of file diff --git a/css/base/gitea/organizr.css b/css/base/gitea/organizr.css index 90025f53..ac4f7b23 100644 --- a/css/base/gitea/organizr.css +++ b/css/base/gitea/organizr.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/organizr.css?sha=fceff07a68bad62cd3848afce664a97f"); \ No newline at end of file diff --git a/css/base/gitea/overseerr.css b/css/base/gitea/overseerr.css index 683e1587..af187b4a 100644 --- a/css/base/gitea/overseerr.css +++ b/css/base/gitea/overseerr.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/overseerr.css?sha=e144b7051d5a835c99e85a5a6b616e5e"); \ No newline at end of file diff --git a/css/base/gitea/pine-shadow.css b/css/base/gitea/pine-shadow.css index 57b8eaf1..03303f4e 100644 --- a/css/base/gitea/pine-shadow.css +++ b/css/base/gitea/pine-shadow.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/pine-shadow.css?sha=953a1c8800f65def81edfbf1097de444"); \ No newline at end of file diff --git a/css/base/gitea/plex.css b/css/base/gitea/plex.css index e4dceac7..bcbdd28d 100644 --- a/css/base/gitea/plex.css +++ b/css/base/gitea/plex.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/plex.css?sha=a4c4891e132b89426160a1fe32205f4f"); \ No newline at end of file diff --git a/css/base/gitea/power.css b/css/base/gitea/power.css index 3cb7b700..9c18ecb2 100644 --- a/css/base/gitea/power.css +++ b/css/base/gitea/power.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/power.css?sha=4bfda3cbb74c41f827e46f8b8e14dbdf"); \ No newline at end of file diff --git a/css/base/gitea/reality.css b/css/base/gitea/reality.css index 9500aec8..a24b662a 100644 --- a/css/base/gitea/reality.css +++ b/css/base/gitea/reality.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/reality.css?sha=fab9956884e76c612c6de71dafb0b746"); \ No newline at end of file diff --git a/css/base/gitea/soul.css b/css/base/gitea/soul.css index 88992e9b..be8aed53 100644 --- a/css/base/gitea/soul.css +++ b/css/base/gitea/soul.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/soul.css?sha=1b36e7232a886dc953c85652881b8a00"); \ No newline at end of file diff --git a/css/base/gitea/space-gray.css b/css/base/gitea/space-gray.css index 110e3979..fc4a71c3 100644 --- a/css/base/gitea/space-gray.css +++ b/css/base/gitea/space-gray.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/theme-options/space-gray.css?sha=90a7104be7219a1a90f4ba0464774472"); \ No newline at end of file diff --git a/css/base/gitea/space.css b/css/base/gitea/space.css index 882ec8af..d7a30c0b 100644 --- a/css/base/gitea/space.css +++ b/css/base/gitea/space.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/space.css?sha=805cb02ce365df0e26965c25e4a105ca"); \ No newline at end of file diff --git a/css/base/gitea/time.css b/css/base/gitea/time.css index 019f6413..5c4df802 100644 --- a/css/base/gitea/time.css +++ b/css/base/gitea/time.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/time.css?sha=2ef20efc1ed3edbad12b085582ce88e6"); \ No newline at end of file diff --git a/css/base/gitea/trueblack.css b/css/base/gitea/trueblack.css index d476d212..a2fc6cec 100644 --- a/css/base/gitea/trueblack.css +++ b/css/base/gitea/trueblack.css @@ -1,2 +1,2 @@ -@import url("/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701"); +@import url("/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605"); @import url("/css/community-theme-options/trueblack.css?sha=541f73821cfe0a75a26106011079b244"); \ No newline at end of file diff --git a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark index d782d345..416c756e 100755 --- a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 14083437..387dcb9e 100755 --- a/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark index 537108d8..541878d5 100755 --- a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index bd68c4a9..16b0285f 100755 --- a/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/radarr/root/etc/cont-init.d/98-themepark b/docker-mods/radarr/root/etc/cont-init.d/98-themepark index 2945c949..aaba7e32 100755 --- a/docker-mods/radarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/radarr/root/etc/cont-init.d/98-themepark @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index bc39ae49..555ab472 100755 --- a/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/readarr/root/etc/cont-init.d/98-themepark b/docker-mods/readarr/root/etc/cont-init.d/98-themepark index 19185740..ac247e57 100755 --- a/docker-mods/readarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/readarr/root/etc/cont-init.d/98-themepark @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' fi diff --git a/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 28f2b78d..b6c21926 100755 --- a/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' fi diff --git a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark index 501578f2..0a4a71e1 100755 --- a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index a854a510..11d97d71 100755 --- a/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s// /g" "${APP_FILEPATH}" - sed -i "s// /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark index 38dacbeb..a34e6089 100755 --- a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 8f710aaa..cdea12d6 100755 --- a/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -50,18 +50,22 @@ fi # Adding stylesheets if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' - echo '| Adding the stylesheet |' + echo '| Adding the stylesheets |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + + url_base="${TP_SCHEME}://${TP_DOMAIN}" + sheets="" + sheets="${sheets} " printf 'Stylesheet set to %s\n' "${TP_THEME}" + if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sheets="${sheets} " printf 'Added custom addon: %s\n\n' "${addon}" done fi -fi \ No newline at end of file + + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + printf 'Stylesheets inserted.' +fi diff --git a/themes.json b/themes.json index 63d44eb7..b986107c 100644 --- a/themes.json +++ b/themes.json @@ -11,9 +11,9 @@ "organizr": { "glass": { "css": [ - "https://develop.theme-park.dev/css/addons/organizr/glass/organizr-base-old.css?sha=7ca2b0e71ab22a2e00ed59acb3415c4e", "https://develop.theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=b7cce58f74f91aaf452f3e2a2fd46e2e", - "https://develop.theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=914bc5aa30992f0ba74793e35b643dc1" + "https://develop.theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=914bc5aa30992f0ba74793e35b643dc1", + "https://develop.theme-park.dev/css/addons/organizr/glass/organizr-base-old.css?sha=7ca2b0e71ab22a2e00ed59acb3415c4e" ] } }, @@ -44,38 +44,38 @@ "login-page": { "alien": { "css": [ - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=41157d0ffbb87985a3d35048fb1ebe30", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=4c9c5c40e696e9258c963981705a9eb2", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=b384251e3a5baf8f43d699dd99c32ca3", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=f42ec439c86c169aca34f7958d6bda7f", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d" + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=4c9c5c40e696e9258c963981705a9eb2", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=41157d0ffbb87985a3d35048fb1ebe30", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46" ] }, "fallout": { "css": [ "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=01cf21af49932e2ab0879da576930920", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=9e80f6fa107747f276298eb42eef781d", "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1a5fd9a10cddc7cc5b2ab268be71b301", + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613", + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=9e80f6fa107747f276298eb42eef781d", "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/fallout-base.css?sha=3c183e6fbcfb18f9ded7887ee6fee86a", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=ba3ee6187c21d2d8e302be035d68496a", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613" + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=ba3ee6187c21d2d8e302be035d68496a" ] }, "retro-terminal": { "css": [ - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=54cf35d4554023944c907f44653db03d", - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=8bff192aff5e98d97e8d1980dd6fd664", - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766", "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=68c9a21adb524cab2e153a66c6a68d70", + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=54cf35d4554023944c907f44653db03d", "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=d8c4b0416a3bd2ee780608d39080e3fc", + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22", "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=84917694a232621fe6ff57d15476506b", - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22" + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=8bff192aff5e98d97e8d1980dd6fd664", + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766" ] } } @@ -243,7 +243,7 @@ }, "gitea": { "addons": {}, - "base_css": "https://develop.theme-park.dev/css/base/gitea/gitea-base.css?sha=e1e99310d71503572cff0ad7a33b4701" + "base_css": "https://develop.theme-park.dev/css/base/gitea/gitea-base.css?sha=427d22b023a3ba8c5b3a9ff7a2c5e605" }, "guacamole": { "addons": {}, @@ -308,9 +308,9 @@ "addons": { "glass": { "css": [ - "https://develop.theme-park.dev/css/addons/organizr/glass/organizr-base-old.css?sha=7ca2b0e71ab22a2e00ed59acb3415c4e", "https://develop.theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=b7cce58f74f91aaf452f3e2a2fd46e2e", - "https://develop.theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=914bc5aa30992f0ba74793e35b643dc1" + "https://develop.theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=914bc5aa30992f0ba74793e35b643dc1", + "https://develop.theme-park.dev/css/addons/organizr/glass/organizr-base-old.css?sha=7ca2b0e71ab22a2e00ed59acb3415c4e" ] } }, @@ -407,38 +407,38 @@ "login-page": { "alien": { "css": [ - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=41157d0ffbb87985a3d35048fb1ebe30", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=4c9c5c40e696e9258c963981705a9eb2", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=b384251e3a5baf8f43d699dd99c32ca3", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=f42ec439c86c169aca34f7958d6bda7f", - "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d" + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=4c9c5c40e696e9258c963981705a9eb2", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=41157d0ffbb87985a3d35048fb1ebe30", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", + "https://develop.theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46" ] }, "fallout": { "css": [ "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=01cf21af49932e2ab0879da576930920", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=9e80f6fa107747f276298eb42eef781d", "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1a5fd9a10cddc7cc5b2ab268be71b301", + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613", + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=9e80f6fa107747f276298eb42eef781d", "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/fallout-base.css?sha=3c183e6fbcfb18f9ded7887ee6fee86a", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=ba3ee6187c21d2d8e302be035d68496a", - "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613" + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", + "https://develop.theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=ba3ee6187c21d2d8e302be035d68496a" ] }, "retro-terminal": { "css": [ - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=54cf35d4554023944c907f44653db03d", - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=8bff192aff5e98d97e8d1980dd6fd664", - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766", "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=68c9a21adb524cab2e153a66c6a68d70", + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=54cf35d4554023944c907f44653db03d", "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=d8c4b0416a3bd2ee780608d39080e3fc", + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22", "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=84917694a232621fe6ff57d15476506b", - "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22" + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=8bff192aff5e98d97e8d1980dd6fd664", + "https://develop.theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766" ] } }