diff --git a/.github/workflows/package-gui.yaml b/.github/workflows/package-gui.yaml index 51fe4461..ad2e6f4f 100644 --- a/.github/workflows/package-gui.yaml +++ b/.github/workflows/package-gui.yaml @@ -1,4 +1,4 @@ -name: ytld-sub Docker Gui Build +name: ytld-sub Docker GUI Build on: push: diff --git a/docker/Dockerfile.gui b/docker/Dockerfile.gui index a057dbdc..1b99d891 100644 --- a/docker/Dockerfile.gui +++ b/docker/Dockerfile.gui @@ -77,7 +77,9 @@ RUN mkdir -p /config && \ ############################################################################### # CONTAINER CONFIGS -ENV EDITOR="nano" \ + +ENV YTDL_SUB_TYPE="gui" \ +EDITOR="nano" \ HOME="/config" \ DOCKER_MODS=linuxserver/mods:universal-cron \ DEFAULT_WORKSPACE=/config/ytdl-sub-configs diff --git a/docker/root/defaults/vs-code-data.tar.gz b/docker/root/defaults/vs-code-data.tar.gz new file mode 100644 index 00000000..194521ce Binary files /dev/null and b/docker/root/defaults/vs-code-data.tar.gz differ diff --git a/docker/root/etc/cont-init.d/30-config b/docker/root/etc/cont-init.d/defaults-gui similarity index 60% rename from docker/root/etc/cont-init.d/30-config rename to docker/root/etc/cont-init.d/defaults-gui index 929e9add..63bd61d2 100644 --- a/docker/root/etc/cont-init.d/30-config +++ b/docker/root/etc/cont-init.d/defaults-gui @@ -1,5 +1,12 @@ #!/usr/bin/with-contenv bash +# Exit if not gui +if [ "$YTDL_SUB_TYPE" != "gui" ] ; then + exit 0 +fi + +echo "Checking ytdl-sub-gui defaults..." + # copy config [[ ! -e /config/ytdl-sub-configs/config.yaml ]] && \ mkdir -p /config/ytdl-sub-configs && \ @@ -10,6 +17,13 @@ [[ ! -d /config/ytdl-sub-configs/examples ]] && \ mkdir -p /config/ytdl-sub-configs/examples && \ cp /defaults/examples/* /config/ytdl-sub-configs/examples +[[ ! -e /config/data/ytdl-sub-applied ]] && \ + echo "First run, placing default vs-code data directory..." && \ + cp /defaults/vs-code-data.tar.gz /config && \ + cd /config && \ + tar -xzf vs-code-data.tar.gz && \ + rm vs-code-data.tar.gz && \ + touch /config/data/ytdl-sub-applied # permissions chown -R ${PUID:-abc}:${PGID:-abc} \ diff --git a/docker/root/etc/cont-init.d/defaults-headless b/docker/root/etc/cont-init.d/defaults-headless new file mode 100644 index 00000000..8d5d632b --- /dev/null +++ b/docker/root/etc/cont-init.d/defaults-headless @@ -0,0 +1,20 @@ +#!/usr/bin/with-contenv bash + +# Exit if gui +if [ "$YTDL_SUB_TYPE" == "gui" ] ; then + exit 0 +fi + +echo "Checking ytdl-sub defaults..." + +# copy config +[[ ! -e /config/config.yaml ]] && \ + cp /defaults/config.yaml /config/config.yaml +[[ ! -e /config/subscriptions.yaml ]] && \ + cp /defaults/subscriptions.yaml /config/subscriptions.yaml +[[ ! -d /config/examples ]] && \ + cp -R /defaults/examples /config/ + +# permissions +chown -R ${PUID:-abc}:${PGID:-abc} \ + /config \ No newline at end of file diff --git a/src/ytdl_sub/__init__.py b/src/ytdl_sub/__init__.py index add5bcfb..a1ae89f9 100644 --- a/src/ytdl_sub/__init__.py +++ b/src/ytdl_sub/__init__.py @@ -1,2 +1,2 @@ -__pypi_version__ = "2023.10.22" -__local_version__ = "2023.10.22+8a02a40" +__pypi_version__ = "2023.10.22.post3" +__local_version__ = "2023.10.22+bfba4f0"