From 9a548bb95fda15bdebe04fb3d17991ad48b828bb Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 7 Feb 2021 09:48:38 -0800 Subject: [PATCH] Fix purescript .cache ownership problem We actually don't want to pass in HOME via sudo, as some programs (such as the npm install script for purescript) will respect it and write root-owner .cache things into /home/riju (causing later failures). --- tools/generate-build-script.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/generate-build-script.js b/tools/generate-build-script.js index ea89b5a..d6dc8fc 100644 --- a/tools/generate-build-script.js +++ b/tools/generate-build-script.js @@ -31,7 +31,7 @@ function makeLangScript(langConfig, isShared) { ) { parts.push(`\ export DEBIAN_FRONTEND=noninteractive -sudo -E apt-get update`); +sudo --preserve-env=DEBIAN_FRONTEND apt-get update`); } if (install) { const { @@ -52,17 +52,17 @@ sudo -E apt-get update`); const { apt, npm, opam, manual } = prepare; if (apt && apt.length > 0) { parts.push(`\ -sudo -E apt-get install -y ${apt.join(" ")}`); +sudo --preserve-env=DEBIAN_FRONTEND apt-get install -y ${apt.join(" ")}`); } if (npm && npm.length > 0) { parts.push(`\ -sudo -E npm install -g ${npm.join(" ")}`); +sudo npm install -g ${npm.join(" ")}`); } if (opam && opam.length > 0) { parts.push(`\ -sudo -E opam init -n --disable-sandboxing --root /opt/opam -sudo -E opam install "${opam.join(" ")}" -y --root /opt/opam -sudo -E ln -s /opt/opam/default/bin/* /usr/local/bin/`); +sudo opam init -n --disable-sandboxing --root /opt/opam +sudo opam install "${opam.join(" ")}" -y --root /opt/opam +sudo ln -s /opt/opam/default/bin/* /usr/local/bin/`); } if (manual) { parts.push(manual);