From 2cf4f9f0eb978dcb59b71ae6895f84d6f464c394 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 4 Jul 2025 18:07:44 +0800 Subject: [PATCH] fix(rclone-retro): fuck shell escaping --- kube/deploy/apps/rclone-retro/app/hr.yaml | 48 +++++++++++------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/kube/deploy/apps/rclone-retro/app/hr.yaml b/kube/deploy/apps/rclone-retro/app/hr.yaml index 9efb8208..0898c0c3 100644 --- a/kube/deploy/apps/rclone-retro/app/hr.yaml +++ b/kube/deploy/apps/rclone-retro/app/hr.yaml @@ -67,16 +67,14 @@ spec: containers: main: &rclct image: *img - 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/'" - - | - _config='{"Progress": true}' - - | - _filter='{ "ExcludeRule": [ "/Nintendo 3DS/title/**/**/content/*.app", "**/*.cia", "**/*.fbi", "**/*.nds", "/GBA/**", "/GBA/*", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] }' - env: *env + 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)}'"] + env: + <<: *env + FILTER: | + "IncludeRule": [ "/Nintendo 3DS/title/**/**/content/*.app", "**/*.cia", "**/*.fbi", "**/*.nds", "/GBA/**", "/GBA/*", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] + CONFIG: | + "Progress": true envFrom: *envFrom securityContext: *sc initContainers: @@ -98,13 +96,13 @@ spec: containers: main: <<: *rclct - args: - - "sync/sync" - - "srcFs='3ds:GBA/'" - - "dstFs='/data/3ds-gba/'" - - | - _config='{"Progress": true}' - env: *env + 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 initContainers: 01-ping: <<: *ping @@ -118,15 +116,13 @@ spec: containers: main: <<: *rclct - args: - - "sync/sync" - - "ds:/" - - "/data/ds/" - - | - _config='{"Progress": true}' - - | - _filter='{ "ExcludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] }' - env: *env + args: ["sync/sync", "ds:/", "/data/ds/", "_filter='{$(FILTER)}'", "_config='{$(CONFIG)}'"] + env: + <<: *env + FILTER: | + "IncludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] + CONFIG: | + "Progress": true initContainers: 01-ping: <<: *ping