From 81b4f7740d87e3216c6d056e6c864922c6553b28 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 9 Mar 2020 22:18:53 +0100
Subject: [PATCH] fix: more xargs typos
---
.../bundler/__snapshots__/artifacts.spec.ts.snap | 6 +++---
.../cargo/__snapshots__/artifacts.spec.ts.snap | 2 +-
.../cocoapods/__snapshots__/artifacts.spec.ts.snap | 14 +++++++-------
.../composer/__snapshots__/artifacts.spec.ts.snap | 2 +-
.../gomod/__snapshots__/artifacts.spec.ts.snap | 8 ++++----
.../gradle/__snapshots__/index.spec.ts.snap | 4 ++--
.../pipenv/__snapshots__/artifacts.spec.ts.snap | 2 +-
.../poetry/__snapshots__/artifacts.spec.ts.snap | 2 +-
lib/util/exec/__snapshots__/exec.spec.ts.snap | 12 ++++++------
lib/util/exec/docker/index.ts | 2 +-
lib/util/exec/exec.spec.ts | 2 +-
11 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap b/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap
index 3d18b2f2ae..f1cae80b85 100644
--- a/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap
@@ -20,7 +20,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_ruby -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_ruby -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -65,7 +65,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_ruby -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_ruby -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -110,7 +110,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_ruby -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_ruby -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap b/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap
index 4a77ff0323..687c058818 100644
--- a/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap
@@ -64,7 +64,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_rust -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_rust -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap b/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
index 971ae28a54..eb6874fe87 100644
--- a/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
@@ -16,7 +16,7 @@ exports[`.updateArtifacts() catches write error 2`] = `Array []`;
exports[`.updateArtifacts() dynamically selects Docker image tag 1`] = `
Array [
Object {
- "cmd": "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -28,7 +28,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -56,7 +56,7 @@ Array [
exports[`.updateArtifacts() falls back to the \`latest\` Docker image tag 1`] = `
Array [
Object {
- "cmd": "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -68,7 +68,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -154,7 +154,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -176,7 +176,7 @@ Array [
exports[`.updateArtifacts() returns updated Podfile 2`] = `
Array [
Object {
- "cmd": "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -188,7 +188,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap b/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap
index a306cd96af..fe23b9deea 100644
--- a/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap
@@ -100,7 +100,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_composer -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_composer -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap b/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap
index 89721ed0f8..6def232ae6 100644
--- a/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap
@@ -76,7 +76,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -114,7 +114,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -141,7 +141,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -179,7 +179,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/gradle/__snapshots__/index.spec.ts.snap b/lib/manager/gradle/__snapshots__/index.spec.ts.snap
index 5366302df9..906a110e13 100644
--- a/lib/manager/gradle/__snapshots__/index.spec.ts.snap
+++ b/lib/manager/gradle/__snapshots__/index.spec.ts.snap
@@ -508,7 +508,7 @@ Array [
exports[`manager/gradle extractPackageFile should use docker even if gradlew is available 1`] = `
Array [
Object {
- "cmd": "docker ps --filter name=renovate_gradle -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_gradle -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
@@ -542,7 +542,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_gradle -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_gradle -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap b/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap
index 2f89d2e84e..69c24bd4bc 100644
--- a/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap
@@ -66,7 +66,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_pipenv -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_pipenv -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap b/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap
index 74e5f3061c..1dbbe193b9 100644
--- a/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap
@@ -65,7 +65,7 @@ Array [
},
},
Object {
- "cmd": "docker ps --filter name=renovate_poetry -aq | xargs ---no-run-if-empty docker rm -f",
+ "cmd": "docker ps --filter name=renovate_poetry -aq | xargs --no-run-if-empty docker rm -f",
"options": Object {
"encoding": "utf-8",
},
diff --git a/lib/util/exec/__snapshots__/exec.spec.ts.snap b/lib/util/exec/__snapshots__/exec.spec.ts.snap
index 032af4ade8..139bf9040e 100644
--- a/lib/util/exec/__snapshots__/exec.spec.ts.snap
+++ b/lib/util/exec/__snapshots__/exec.spec.ts.snap
@@ -4,18 +4,18 @@ exports[`Child process execution wrapper Supports image prefetch 1`] = `
Array [
"echo hello",
"echo hello",
- "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f",
+ "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f",
"docker pull example/image",
- "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f",
+ "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f",
"docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"",
- "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f",
+ "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f",
"docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"",
"echo hello",
"echo hello",
- "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f",
- "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f",
+ "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f",
+ "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f",
"docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"",
- "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f",
+ "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f",
"docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"",
]
`;
diff --git a/lib/util/exec/docker/index.ts b/lib/util/exec/docker/index.ts
index 6f436746ee..ddbca758b7 100644
--- a/lib/util/exec/docker/index.ts
+++ b/lib/util/exec/docker/index.ts
@@ -136,7 +136,7 @@ export async function removeDockerContainer(image): Promise<void> {
export async function removeDanglingContainers(): Promise<void> {
try {
const res = await rawExec(
- `docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f`,
+ `docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f`,
{ encoding: 'utf-8' }
);
if (res?.stdout?.trim().length) {
diff --git a/lib/util/exec/exec.spec.ts b/lib/util/exec/exec.spec.ts
index ccc708314a..f7c35b69ab 100644
--- a/lib/util/exec/exec.spec.ts
+++ b/lib/util/exec/exec.spec.ts
@@ -72,7 +72,7 @@ describe(`Child process execution wrapper`, () => {
const docker = { image };
const processEnv = envMock.full;
const dockerPullCmd = `docker pull ${image}`;
- const dockerRemoveCmd = `docker ps --filter name=${name} -aq | xargs ---no-run-if-empty docker rm -f`;
+ const dockerRemoveCmd = `docker ps --filter name=${name} -aq | xargs --no-run-if-empty docker rm -f`;
const dockerPullOpts = { encoding };
const dockerRemoveOpts = dockerPullOpts;
--
GitLab