diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 1a2287b9..4f682076 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -3,6 +3,8 @@ on: push: branches: - master + - develop + - testing paths: - 'docker-mods/**' workflow_dispatch: @@ -51,32 +53,30 @@ 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 }} password: ${{ secrets.GH_PAT }} - - name: find correct directory then build&push - if: ${{ github.event_name == 'push' }} + - name: build all on ${GITHUB_REF##*/} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} 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 + 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 + docker push ghcr.io/gilbn/theme.park:$app + done + - name: build all on ${GITHUB_REF##*/} with tag + if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/develop' }} + 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_REF##*/} + docker push ghcr.io/gilbn/theme.park:$app-${GITHUB_REF##*/} + done - name: manually build if: ${{ github.event.inputs.app && github.event.inputs.app != 'build-all-the-mods' }} run: | @@ -91,6 +91,7 @@ jobs: 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 }} done + push_to_dockerhub: runs-on: ubuntu-latest steps: @@ -98,31 +99,29 @@ 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 - if: ${{ github.event_name == 'push' }} + - name: build all on ${GITHUB_REF##*/} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} 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 + 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 + docker push ghcr.io/gilbn/theme.park:$app + done + - name: build all on ${GITHUB_REF##*/} with tag + if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/develop' }} + 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_REF##*/} + docker push ghcr.io/gilbn/theme.park:$app-${GITHUB_REF##*/} + done - name: manually build if: ${{ github.event.inputs.app && github.event.inputs.app != 'build-all-the-mods' }} run: | diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 25c94a93..a8c8624e 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -136,7 +136,7 @@ jobs: docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:${TAG} - name: Latest manifest - if: ${{ github.event.release.target_commitish == 'master' }} || ${{ github.event.inputs.branch == 'master' }} + if: github.event.release.target_commitish == 'master' || github.event.inputs.branch == 'master' env: DOCKER_CLI_EXPERIMENTAL: enabled run: | diff --git a/css/base/tautulli/aquamarine.css b/css/base/tautulli/aquamarine.css index 6fd5b7d4..d4e6c9e7 100644 --- a/css/base/tautulli/aquamarine.css +++ b/css/base/tautulli/aquamarine.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/aquamarine.css?sha=d756574a59cc3bfa2433998efaf57bf3"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-abyss.css b/css/base/tautulli/blackberry-abyss.css index 95cde290..2692c330 100644 --- a/css/base/tautulli/blackberry-abyss.css +++ b/css/base/tautulli/blackberry-abyss.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-abyss.css?sha=e8399c6f8a2e9f3ec99f9aad936db7a9"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-amethyst.css b/css/base/tautulli/blackberry-amethyst.css index 4d7014c4..0d5256ed 100644 --- a/css/base/tautulli/blackberry-amethyst.css +++ b/css/base/tautulli/blackberry-amethyst.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-amethyst.css?sha=87786d9451286f37b81293bbf51a8205"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-carol.css b/css/base/tautulli/blackberry-carol.css index 1e50b78f..cfe3cf91 100644 --- a/css/base/tautulli/blackberry-carol.css +++ b/css/base/tautulli/blackberry-carol.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-carol.css?sha=dd744035926663fc42242daedc9f1794"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-dreamscape.css b/css/base/tautulli/blackberry-dreamscape.css index 93c26012..98d98270 100644 --- a/css/base/tautulli/blackberry-dreamscape.css +++ b/css/base/tautulli/blackberry-dreamscape.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-dreamscape.css?sha=81a988c1ccc397ca303b898a69b8933f"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-flamingo.css b/css/base/tautulli/blackberry-flamingo.css index d6cd7bf7..675c1a29 100644 --- a/css/base/tautulli/blackberry-flamingo.css +++ b/css/base/tautulli/blackberry-flamingo.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-flamingo.css?sha=1f73a7b422a1ad484a33b95e71e542d7"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-hearth.css b/css/base/tautulli/blackberry-hearth.css index eb8dec26..a8e34686 100644 --- a/css/base/tautulli/blackberry-hearth.css +++ b/css/base/tautulli/blackberry-hearth.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-hearth.css?sha=63eff67e0507c9f40b3a6d721fd2e00b"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-martian.css b/css/base/tautulli/blackberry-martian.css index 9d86cb9a..c05fba4a 100644 --- a/css/base/tautulli/blackberry-martian.css +++ b/css/base/tautulli/blackberry-martian.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-martian.css?sha=b147b481a6e52a58dccff4ff3e2b83a0"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-pumpkin.css b/css/base/tautulli/blackberry-pumpkin.css index 3e641cf5..e894a31e 100644 --- a/css/base/tautulli/blackberry-pumpkin.css +++ b/css/base/tautulli/blackberry-pumpkin.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-pumpkin.css?sha=ded53ed23d3bb1b293c2b444f9c6b520"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-royal.css b/css/base/tautulli/blackberry-royal.css index 17c8e240..e47e0237 100644 --- a/css/base/tautulli/blackberry-royal.css +++ b/css/base/tautulli/blackberry-royal.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-royal.css?sha=5656c5c4f467941883374376d45a8758"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-shadow.css b/css/base/tautulli/blackberry-shadow.css index 9449d58d..240199ca 100644 --- a/css/base/tautulli/blackberry-shadow.css +++ b/css/base/tautulli/blackberry-shadow.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-shadow.css?sha=b8941bbed98a08998a2fbe28319112c0"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-solar.css b/css/base/tautulli/blackberry-solar.css index e9901314..9f15eb94 100644 --- a/css/base/tautulli/blackberry-solar.css +++ b/css/base/tautulli/blackberry-solar.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-solar.css?sha=b993845b73c14914d185a76b44750c64"); \ No newline at end of file diff --git a/css/base/tautulli/blackberry-vanta.css b/css/base/tautulli/blackberry-vanta.css index 15aa5354..69f41a30 100644 --- a/css/base/tautulli/blackberry-vanta.css +++ b/css/base/tautulli/blackberry-vanta.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/blackberry-vanta.css?sha=66ca6a0d6a5055bc0a2a0460c945fa7a"); \ No newline at end of file diff --git a/css/base/tautulli/dark.css b/css/base/tautulli/dark.css index fda7e9ac..777d7ee4 100644 --- a/css/base/tautulli/dark.css +++ b/css/base/tautulli/dark.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/dark.css?sha=1bbea8b71216f2c2b7eff31ee72c389f"); \ No newline at end of file diff --git a/css/base/tautulli/dracula.css b/css/base/tautulli/dracula.css index d9a0755d..ad779903 100644 --- a/css/base/tautulli/dracula.css +++ b/css/base/tautulli/dracula.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/dracula.css?sha=6366d3845240fb8943c2b54d56335a19"); \ No newline at end of file diff --git a/css/base/tautulli/hotline-old.css b/css/base/tautulli/hotline-old.css index b7d6f17a..a9fe6ea3 100644 --- a/css/base/tautulli/hotline-old.css +++ b/css/base/tautulli/hotline-old.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/hotline-old.css?sha=1996bf028fd671f9a43dc15035e65c33"); \ No newline at end of file diff --git a/css/base/tautulli/hotline.css b/css/base/tautulli/hotline.css index 48b8a6e5..de167cb6 100644 --- a/css/base/tautulli/hotline.css +++ b/css/base/tautulli/hotline.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/hotline.css?sha=b104dcbd717283d00fe6de4219744ecc"); \ No newline at end of file diff --git a/css/base/tautulli/hotpink.css b/css/base/tautulli/hotpink.css index b8a2c14b..e355726e 100644 --- a/css/base/tautulli/hotpink.css +++ b/css/base/tautulli/hotpink.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/hotpink.css?sha=152a8bd511ff5cfe5df90e00688ba1fc"); \ No newline at end of file diff --git a/css/base/tautulli/ibracorp.css b/css/base/tautulli/ibracorp.css index 4bab9481..7f231223 100644 --- a/css/base/tautulli/ibracorp.css +++ b/css/base/tautulli/ibracorp.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/ibracorp.css?sha=c614a1a123a048850289e718fd113c8f"); \ No newline at end of file diff --git a/css/base/tautulli/maroon.css b/css/base/tautulli/maroon.css index 972b9935..6ac60269 100644 --- a/css/base/tautulli/maroon.css +++ b/css/base/tautulli/maroon.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/maroon.css?sha=aba3461aac201e257cf5cea12d9f6c5c"); \ No newline at end of file diff --git a/css/base/tautulli/mind.css b/css/base/tautulli/mind.css index 809d4afd..c03f71c2 100644 --- a/css/base/tautulli/mind.css +++ b/css/base/tautulli/mind.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/mind.css?sha=9f02ff1636bb19fbbc1c883f0a69814d"); \ No newline at end of file diff --git a/css/base/tautulli/nord.css b/css/base/tautulli/nord.css index fc746742..049d3791 100644 --- a/css/base/tautulli/nord.css +++ b/css/base/tautulli/nord.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/nord.css?sha=1b026fc9951acb87776302d71db5705e"); \ No newline at end of file diff --git a/css/base/tautulli/onedark.css b/css/base/tautulli/onedark.css index 8a6bfe70..912fd04a 100644 --- a/css/base/tautulli/onedark.css +++ b/css/base/tautulli/onedark.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/onedark.css?sha=35d1229e080c54d138ea4c9512c0f0db"); \ No newline at end of file diff --git a/css/base/tautulli/organizr.css b/css/base/tautulli/organizr.css index cefa1040..33243468 100644 --- a/css/base/tautulli/organizr.css +++ b/css/base/tautulli/organizr.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/organizr.css?sha=fceff07a68bad62cd3848afce664a97f"); \ No newline at end of file diff --git a/css/base/tautulli/overseerr.css b/css/base/tautulli/overseerr.css index 1926a7c6..82a71d18 100644 --- a/css/base/tautulli/overseerr.css +++ b/css/base/tautulli/overseerr.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/overseerr.css?sha=e144b7051d5a835c99e85a5a6b616e5e"); \ No newline at end of file diff --git a/css/base/tautulli/pine-shadow.css b/css/base/tautulli/pine-shadow.css index 5ea08438..c8c8c9e3 100644 --- a/css/base/tautulli/pine-shadow.css +++ b/css/base/tautulli/pine-shadow.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/pine-shadow.css?sha=953a1c8800f65def81edfbf1097de444"); \ No newline at end of file diff --git a/css/base/tautulli/plex.css b/css/base/tautulli/plex.css index 097b43e2..0838c372 100644 --- a/css/base/tautulli/plex.css +++ b/css/base/tautulli/plex.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/plex.css?sha=a4c4891e132b89426160a1fe32205f4f"); \ No newline at end of file diff --git a/css/base/tautulli/power.css b/css/base/tautulli/power.css index 7a41c1fe..1aadf292 100644 --- a/css/base/tautulli/power.css +++ b/css/base/tautulli/power.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/power.css?sha=4bfda3cbb74c41f827e46f8b8e14dbdf"); \ No newline at end of file diff --git a/css/base/tautulli/reality.css b/css/base/tautulli/reality.css index e4457c75..4a89790d 100644 --- a/css/base/tautulli/reality.css +++ b/css/base/tautulli/reality.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/reality.css?sha=fab9956884e76c612c6de71dafb0b746"); \ No newline at end of file diff --git a/css/base/tautulli/soul.css b/css/base/tautulli/soul.css index 93019c8a..a3131a53 100644 --- a/css/base/tautulli/soul.css +++ b/css/base/tautulli/soul.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/soul.css?sha=1b36e7232a886dc953c85652881b8a00"); \ No newline at end of file diff --git a/css/base/tautulli/space-gray.css b/css/base/tautulli/space-gray.css index 630a3109..111351b9 100644 --- a/css/base/tautulli/space-gray.css +++ b/css/base/tautulli/space-gray.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/theme-options/space-gray.css?sha=90a7104be7219a1a90f4ba0464774472"); \ No newline at end of file diff --git a/css/base/tautulli/space.css b/css/base/tautulli/space.css index 685cee35..99e7c66d 100644 --- a/css/base/tautulli/space.css +++ b/css/base/tautulli/space.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/space.css?sha=805cb02ce365df0e26965c25e4a105ca"); \ No newline at end of file diff --git a/css/base/tautulli/tautulli-base.css b/css/base/tautulli/tautulli-base.css index 9c8b78bd..4a4f89ca 100644 --- a/css/base/tautulli/tautulli-base.css +++ b/css/base/tautulli/tautulli-base.css @@ -206,7 +206,7 @@ select, .dashboard-stats-background, .dashboard-activity-background, .dashboard-activity-poster-container { - background: var(--transparency-dark-25); + background-color: var(--transparency-dark-25); } .dashboard-activity-progress-bar { diff --git a/css/base/tautulli/time.css b/css/base/tautulli/time.css index f6894742..8f765a67 100644 --- a/css/base/tautulli/time.css +++ b/css/base/tautulli/time.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @import url("/css/community-theme-options/time.css?sha=2ef20efc1ed3edbad12b085582ce88e6"); \ No newline at end of file diff --git a/css/base/tautulli/trueblack.css b/css/base/tautulli/trueblack.css index bb9161be..b77d5e64 100644 --- a/css/base/tautulli/trueblack.css +++ b/css/base/tautulli/trueblack.css @@ -1,2 +1,2 @@ -@import url("/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364"); +@import url("/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624"); @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 c27cd010..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/<\/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/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 0b1471c2..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/<\/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/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark index 24aa5eca..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/<\/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/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 37afbbbd..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/<\/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/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark index dc6916b5..8993c58f 100755 --- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark @@ -98,8 +98,8 @@ sed_file(){ } clean_file() { - perl -i -pe 's/QBT_TR?\(//' "$1" - perl -i -pe 's/\)QBT_TR\[CONTEXT=.*?\]//' "$1" + perl -i -pe 's/QBT_TR?\(//g' "$1" + perl -i -pe 's/\)QBT_TR\[CONTEXT=.*?\]//g' "$1" } if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then @@ -117,10 +117,9 @@ if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then fi # Clean all files -printf 'Cleaning files in /themepark for any translation text...\n\n --------------------------------------------------------------------------- -| !!! RESTART THE CONTAINER IF THIS IS THE FIRST TIME CLEANING FILES !!! | ---------------------------------------------------------------------------\n\n' +echo '------------------------------------------------------------' +echo '| Cleaning files in /themepark for any translation text... |' +echo '------------------------------------------------------------' find /themepark -type f \( ! -iname "*.svg" \) | while read fname do clean_file $fname diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 0d884081..52892435 100755 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -83,8 +83,8 @@ sed_file(){ } clean_file() { - perl -i -pe 's/QBT_TR?\(//' "$1" - perl -i -pe 's/\)QBT_TR\[CONTEXT=.*?\]//' "$1" + perl -i -pe 's/QBT_TR?\(//g' "$1" + perl -i -pe 's/\)QBT_TR\[CONTEXT=.*?\]//g' "$1" } if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then @@ -102,10 +102,9 @@ if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then fi # Clean all files -printf 'Cleaning files in /themepark for any translation text...\n\n --------------------------------------------------------------------------- -| !!! RESTART THE CONTAINER IF THIS IS THE FIRST TIME CLEANING FILES !!! | ---------------------------------------------------------------------------\n\n' +echo '------------------------------------------------------------' +echo '| Cleaning files in /themepark for any translation text... |' +echo '------------------------------------------------------------' find /themepark -type f \( ! -iname "*.svg" \) | while read fname do clean_file $fname 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 6c4e634d..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/<\/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/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 4051c1fd..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/<\/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/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 31c35abc..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/<\/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/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 636eb2ae..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/<\/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/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 a4ca38e9..96f66011 100644 --- a/themes.json +++ b/themes.json @@ -44,38 +44,38 @@ "login-page": { "alien": { "css": [ - "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d", - "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", - "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=b384251e3a5baf8f43d699dd99c32ca3", - "https://theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", - "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=41157d0ffbb87985a3d35048fb1ebe30", - "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", - "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=f42ec439c86c169aca34f7958d6bda7f", + "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", + "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", + "https://theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", + "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46", "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=4c9c5c40e696e9258c963981705a9eb2", - "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46" + "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", + "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=b384251e3a5baf8f43d699dd99c32ca3", + "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=f42ec439c86c169aca34f7958d6bda7f", + "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d" ] }, "fallout": { "css": [ - "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout-base.css?sha=3c183e6fbcfb18f9ded7887ee6fee86a", - "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=01cf21af49932e2ab0879da576930920", + "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=9e80f6fa107747f276298eb42eef781d", - "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613", + "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1a5fd9a10cddc7cc5b2ab268be71b301", + "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout-base.css?sha=3c183e6fbcfb18f9ded7887ee6fee86a", "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=ba3ee6187c21d2d8e302be035d68496a", - "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1a5fd9a10cddc7cc5b2ab268be71b301" + "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613" ] }, "retro-terminal": { "css": [ - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22", "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=54cf35d4554023944c907f44653db03d", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=84917694a232621fe6ff57d15476506b", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=d8c4b0416a3bd2ee780608d39080e3fc", "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=8bff192aff5e98d97e8d1980dd6fd664", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=68c9a21adb524cab2e153a66c6a68d70" + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=68c9a21adb524cab2e153a66c6a68d70", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=d8c4b0416a3bd2ee780608d39080e3fc", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=84917694a232621fe6ff57d15476506b", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22" ] } } @@ -396,7 +396,7 @@ }, "tautulli": { "addons": {}, - "base_css": "https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=77ade73bb8491883c2f27b36027bf364" + "base_css": "https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ec36ae9b66c59fc187e554f151952624" }, "transmission": { "addons": {}, @@ -407,38 +407,38 @@ "login-page": { "alien": { "css": [ - "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d", - "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", - "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=b384251e3a5baf8f43d699dd99c32ca3", - "https://theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", - "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=41157d0ffbb87985a3d35048fb1ebe30", - "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", - "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=f42ec439c86c169aca34f7958d6bda7f", + "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=dd01b13d8039ae268e41f876e8588f79", + "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=66fb1e93836e81eb0fa3fa27147cb9ea", + "https://theme-park.dev/css/addons/unraid/login-page/alien/alien-base.css?sha=d7045656054ac9d428c390d0a96ff4bb", + "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46", "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=4c9c5c40e696e9258c963981705a9eb2", - "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=1da7c77a6d81a9ccf14e8b802ab0fd46" + "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=c838308ddf177d74e75fae445b2ea824", + "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=b384251e3a5baf8f43d699dd99c32ca3", + "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=f42ec439c86c169aca34f7958d6bda7f", + "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=9c97f33f026050abca26282258e9f35d" ] }, "fallout": { "css": [ - "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout-base.css?sha=3c183e6fbcfb18f9ded7887ee6fee86a", - "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=01cf21af49932e2ab0879da576930920", + "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=a803842569b686a642260679106742a9", "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=9e80f6fa107747f276298eb42eef781d", - "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613", + "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1a5fd9a10cddc7cc5b2ab268be71b301", + "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout-base.css?sha=3c183e6fbcfb18f9ded7887ee6fee86a", "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=ba3ee6187c21d2d8e302be035d68496a", - "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1a5fd9a10cddc7cc5b2ab268be71b301" + "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=ec87723e62568661bbb9313c129da613" ] }, "retro-terminal": { "css": [ - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22", "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=54cf35d4554023944c907f44653db03d", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=84917694a232621fe6ff57d15476506b", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=d8c4b0416a3bd2ee780608d39080e3fc", "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=8bff192aff5e98d97e8d1980dd6fd664", - "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=68c9a21adb524cab2e153a66c6a68d70" + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=6bd4eead62c6381261f8beb78c3a1766", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=68c9a21adb524cab2e153a66c6a68d70", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=d8c4b0416a3bd2ee780608d39080e3fc", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=84917694a232621fe6ff57d15476506b", + "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=585b2b9c06233e8a0b90b155a2ec1d22" ] } }