From 6464d42120f83adc8f7bbd46ad80c8e1f5004cb9 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 4 Jul 2025 23:06:50 +0800 Subject: [PATCH] fix(rclone-retro): fuck shell escaping --- kube/deploy/apps/rclone-retro/app/hr.yaml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/kube/deploy/apps/rclone-retro/app/hr.yaml b/kube/deploy/apps/rclone-retro/app/hr.yaml index 376b5b5b..c585adb4 100644 --- a/kube/deploy/apps/rclone-retro/app/hr.yaml +++ b/kube/deploy/apps/rclone-retro/app/hr.yaml @@ -67,14 +67,11 @@ 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/'", "_filter=\"$(FILTER)\"", "_config=\"$(CONFIG)\""] + 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) $(ARG)"] env: <<: *env - FILTER: >- - { "ExcludeRule": [ "/Nintendo 3DS/title/**/**/content/*.app", "**/*.cia", "**/*.fbi", "**/*.nds", "/GBA/**", "/GBA/*", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] } - CONFIG: >- - {"Progress": true} + ARG: | + 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" ] }' envFrom: *envFrom securityContext: *sc initContainers: @@ -96,11 +93,10 @@ spec: containers: main: <<: *rclct - args: ["sync/sync", "srcFs='3ds:GBA/'", "dstFs='/data/3ds-gba/'", "_config=\"$(CONFIG)\""] env: <<: *env - CONFIG: | - {"Progress": true} + ARG: | + sync/sync srcFs='3ds:GBA/' dstFs='/data/3ds-gba/' _config='{"Progress": true}' initContainers: 01-ping: <<: *ping @@ -114,13 +110,10 @@ spec: containers: main: <<: *rclct - args: ["sync/sync", "ds:/", "/data/ds/", "_filter=\"$(FILTER)\"", "_config=\"$(CONFIG)\""] env: <<: *env - FILTER: | - { "ExcludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] } - CONFIG: | - {"Progress": true} + ARG: | + sync/sync srcFs='ds:/' dstFs='/data/ds/' _config='{"Progress": true}' _filter='{ "ExcludeRule": [ "**/*.nds", "**/*.mp3", "**/*.m4a", "**/*.aac", "**/*.wav", "**/*.flac" ] }' initContainers: 01-ping: <<: *ping