From 8bec35a748b8ffe5fe182c2845515924ee90d000 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 4 Jul 2025 21:32:53 +0800 Subject: [PATCH] fix(rclone-retro): fuck shell escaping --- kube/deploy/apps/rclone-retro/app/hr.yaml | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/kube/deploy/apps/rclone-retro/app/hr.yaml b/kube/deploy/apps/rclone-retro/app/hr.yaml index 0898c0c3..376b5b5b 100644 --- a/kube/deploy/apps/rclone-retro/app/hr.yaml +++ b/kube/deploy/apps/rclone-retro/app/hr.yaml @@ -67,14 +67,14 @@ spec: containers: main: &rclct image: *img - command: ["/bin/sh", "-c", "rclone", "rc", "--rc-addr=http://rclone-retro-app.rclone-retro.svc.cluster.local/", "--rc-user=$(RC_USER)", "--rc-pass=$(RC_PASS)"] - args: ["sync/sync", "srcFs='3ds:/'", "dstFs='/data/3ds/'", "_filter='{$(FILTER)}'", "_config='{$(CONFIG)}'"] + command: ["rclone", "rc", "--rc-addr=http://rclone-retro-app.rclone-retro.svc.cluster.local/", "--rc-user=$(RC_USER)", "--rc-pass=$(RC_PASS)"] + args: ["sync/sync", "srcFs='3ds:/'", "dstFs='/data/3ds/'", "_filter=\"$(FILTER)\"", "_config=\"$(CONFIG)\""] env: <<: *env - FILTER: | - "IncludeRule": [ "/Nintendo 3DS/title/**/**/content/*.app", "**/*.cia", "**/*.fbi", "**/*.nds", "/GBA/**", "/GBA/*", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] - CONFIG: | - "Progress": true + FILTER: >- + { "ExcludeRule": [ "/Nintendo 3DS/title/**/**/content/*.app", "**/*.cia", "**/*.fbi", "**/*.nds", "/GBA/**", "/GBA/*", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] } + CONFIG: >- + {"Progress": true} envFrom: *envFrom securityContext: *sc initContainers: @@ -96,13 +96,11 @@ spec: containers: main: <<: *rclct - args: ["sync/sync", "srcFs='3ds:GBA/'", "dstFs='/data/3ds-gba/'", "_config='{$(CONFIG)}'"] + args: ["sync/sync", "srcFs='3ds:GBA/'", "dstFs='/data/3ds-gba/'", "_config=\"$(CONFIG)\""] env: <<: *env - FILTER: | - "IncludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] CONFIG: | - "Progress": true + {"Progress": true} initContainers: 01-ping: <<: *ping @@ -116,13 +114,13 @@ spec: containers: main: <<: *rclct - args: ["sync/sync", "ds:/", "/data/ds/", "_filter='{$(FILTER)}'", "_config='{$(CONFIG)}'"] + args: ["sync/sync", "ds:/", "/data/ds/", "_filter=\"$(FILTER)\"", "_config=\"$(CONFIG)\""] env: <<: *env FILTER: | - "IncludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] + { "ExcludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] } CONFIG: | - "Progress": true + {"Progress": true} initContainers: 01-ping: <<: *ping