From 7250cbcef1702bc0e71893e232930ae791961288 Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Tue, 11 Feb 2025 12:12:31 -0800 Subject: [PATCH 1/5] fix command line errors --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 16f5d13..fd936ad 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,7 @@ while : do DATE=$(date) - /opt/zap2xml.pl "$OPT_ARGS" + /opt/zap2xml.pl $OPT_ARGS echo "Last run time: $DATE" echo "Will run in $SLEEPTIME seconds" sleep "$SLEEPTIME" From 96ded1e06d071baba970b9965519e30bc62311cd Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Wed, 12 Feb 2025 12:57:41 -0800 Subject: [PATCH 2/5] update readme to add xmltv output path, change timezone to Los_Angeles --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d91d6dd..3a6468d 100644 --- a/README.md +++ b/README.md @@ -12,16 +12,15 @@ See [zap2xml](https://web.archive.org/web/20200426004001/zap2xml.awardspace.info ### Compose ```yaml -version: '3' services: zap2xml: container_name: zap2xml image: ghcr.io/jef/zap2xml:latest environment: OPT_ARGS: >- - -I -D -C /config/.zap2xmlrc + -I -D -C /config/.zap2xmlrc -o /xmltv/xmltv.xml SLEEPTIME: 43200 # 12 hours in seconds - TZ: America/New_York + TZ: America/Los_Angeles volumes: - /path/to/appdata/zap2xml:/config - /path/to/appdata/xmltv:/xmltv # nice for mapping other drives to this that may use xmltv.xml From 5b9b9847acf2a34b8dc56da983816c4cf153be8a Mon Sep 17 00:00:00 2001 From: ldnguyen97 <59911595+ldnguyen97@users.noreply.github.com> Date: Wed, 12 Feb 2025 13:04:28 -0800 Subject: [PATCH 3/5] Create docker-image.yml --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..22c0685 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag ghcr.io/ldnguyen97/zap2xml:$(date +%s) From 722eaabe037b44c8ed3c13b027f1d4e896c0ad1b Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Wed, 12 Feb 2025 14:16:38 -0800 Subject: [PATCH 4/5] revert TZ change and docker-image.yml creation --- .github/workflows/docker-image.yml | 18 ------------------ README.md | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 22c0685..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag ghcr.io/ldnguyen97/zap2xml:$(date +%s) diff --git a/README.md b/README.md index 3a6468d..e74e40a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ services: OPT_ARGS: >- -I -D -C /config/.zap2xmlrc -o /xmltv/xmltv.xml SLEEPTIME: 43200 # 12 hours in seconds - TZ: America/Los_Angeles + TZ: America/New_York volumes: - /path/to/appdata/zap2xml:/config - /path/to/appdata/xmltv:/xmltv # nice for mapping other drives to this that may use xmltv.xml From 229e172c779aa4ff07dfc6230b13f8c0134e7f9c Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Sun, 13 Apr 2025 00:53:11 -0700 Subject: [PATCH 5/5] Use eval to fix command line errors --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index fd936ad..14d4887 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,7 @@ while : do DATE=$(date) - /opt/zap2xml.pl $OPT_ARGS + eval /opt/zap2xml.pl "$OPT_ARGS" echo "Last run time: $DATE" echo "Will run in $SLEEPTIME seconds" sleep "$SLEEPTIME"