From 0f1a884214bd3be2348ea4185cd3041d26ea02ed Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Mon, 9 Nov 2020 13:09:15 +0100 Subject: [PATCH] Patch oclif/dev-cli to fix permission issues Change-type: patch Signed-off-by: Scott Lowe --- package.json | 1 - patches/all/@oclif+dev-cli+1.22.2.patch | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4068dd76..87ea4a40 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "resin.io", "git" ], - "author": "Juan Cruz Viotti ", "license": "Apache-2.0", "engines": { "node": ">=10.20.0" diff --git a/patches/all/@oclif+dev-cli+1.22.2.patch b/patches/all/@oclif+dev-cli+1.22.2.patch index 7d402689..ebd560f7 100644 --- a/patches/all/@oclif+dev-cli+1.22.2.patch +++ b/patches/all/@oclif+dev-cli+1.22.2.patch @@ -1,3 +1,18 @@ +diff --git a/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js b/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js +index 51bce6e..a38f00f 100644 +--- a/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js ++++ b/node_modules/@oclif/dev-cli/lib/commands/pack/deb.js +@@ -37,8 +37,8 @@ class PackDeb extends command_1.Command { + await qq.write([workspace, 'DEBIAN/control'], scripts.control(buildConfig, debArch(arch))); + await qq.chmod([workspace, 'usr/lib', config.dirname, 'bin', config.bin], 0o755); + await qq.x(`ln -s "../lib/${config.dirname}/bin/${config.bin}" "${workspace}/usr/bin/${config.bin}"`); +- await qq.x(`chown -R root "${workspace}"`); +- await qq.x(`chgrp -R root "${workspace}"`); ++ await qq.x(`sudo chown -R root "${workspace}"`); ++ await qq.x(`sudo chgrp -R root "${workspace}"`); + await qq.x(`dpkg --build "${workspace}" "${qq.join(dist, `${versionedDebBase}.deb`)}"`); + }; + const arches = _.uniq(buildConfig.targets diff --git a/node_modules/@oclif/dev-cli/lib/commands/pack/macos.js b/node_modules/@oclif/dev-cli/lib/commands/pack/macos.js index cd771cd..4a66939 100644 --- a/node_modules/@oclif/dev-cli/lib/commands/pack/macos.js