Merge pull request #13 from aminya/linux-init [skip ci]

Author: aminya

building/docker/debian.dockerfile

@@ -6,11 +6,11 @@ WORKDIR "/"
 RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends apt-utils
 RUN apt-get install -y --no-install-recommends ca-certificates wget unzip
-RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.5.2/setup_cpp_linux"
+RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.5.4/setup_cpp_linux"
 RUN chmod +x ./setup_cpp_linux
 
 # install llvm, cmake, ninja, and ccache
-RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true
+RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
 # reload the environment
 CMD source ~/.profile 

building/docker/debian_node.dockerfile

@@ -6,7 +6,7 @@ ADD "./dist/" "/"
 WORKDIR "/"
 
 # run installation
-RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true
+RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
 # reload the environment
 CMD source ~/.profile 

building/docker/debian_node_slim.dockerfile

@@ -10,7 +10,7 @@ RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends unzip
 
 # run installation
-RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --conan true
+RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --conan true --vcpkg true
 
 # reload the environment
 CMD source ~/.profile 

dist/setup_cpp.js

@@ -1,6 +1,6 @@
 import execa from "execa"
 // import { join } from "path"
-// import untildify from "untildify"
+// import { untildify_user as untildify } from "./utils/path/untildify"
 // import { setupCmake } from "../cmake/cmake"
 import { execaSudo } from "../utils/env/sudo"
 import { addBinExtension } from "../utils/extension/extension"
@@ -33,7 +33,7 @@ function getKcovPackageInfo(version: string): PackageInfo {
       extractFunction: async (file: string, dest: string): Promise<string> => {
         const out = await extractTarByExe(file, dest)
         // build after extraction using CMake
-        // await setupCmake("3.22.0", join(untildify("~/"), "cmake"), "")
+        // await setupCmake("3.22.0", join(untildify(""), "cmake"), "")
         await setupAptPack("libdw-dev")
         await setupAptPack("libcurl4-openssl-dev")
         await execa("cmake", ["-S", "./", "-B", "./build"], { cwd: out })

dist/setup_cpp.js.map

@@ -14,7 +14,7 @@ import { setupNinja } from "./ninja/ninja"
 import { setupOpencppcoverage } from "./opencppcoverage/opencppcoverage"
 import { setupPython } from "./python/python"
 import mri from "mri"
-import untildify from "untildify"
+import { untildify_user as untildify } from "./utils/path/untildify"
 import { isGitHubCI } from "./utils/env/isci"
 
 import semverValid from "semver/functions/valid"
@@ -101,7 +101,7 @@ export async function main(args: string[]): Promise<number> {
   const arch = opts.architecture ?? process.arch
 
   // the installation dir for the tools that are downloaded directly
-  const setupCppDir = process.env.SETUP_CPP_DIR ?? untildify("~/")
+  const setupCppDir = process.env.SETUP_CPP_DIR ?? untildify("")
 
   // report messages
   const successMessages: string[] = []

src/kcov/kcov.ts

@@ -2,8 +2,10 @@ import { exportVariable } from "@actions/core"
 import * as core from "@actions/core"
 import execa from "execa"
 import { isGitHubCI } from "./isci"
-import untildify from "untildify"
+import { untildify_user as untildify } from "../path/untildify"
 import { appendFileSync } from "fs"
+import { join } from "path"
+import { isRoot } from "./sudo"
 
 /** An add path function that works locally or inside GitHub Actions */
 export function addEnv(name: string, val: string | undefined) {
@@ -33,8 +35,14 @@ function addEnvSystem(name: string, val: string | undefined) {
     }
     case "linux":
     case "darwin": {
-      const profile_path = untildify("~/.profile")
-      appendFileSync(profile_path, `\nexport ${name}="${val}\n`)
+      // find profile path
+      let profile_path = untildify(".profile")
+      if (isRoot() && typeof process.env.SUDO_USER === "string") {
+        // use the user profile even if root
+        profile_path = join("/home/", process.env.SUDO_USER, ".profile")
+      }
+
+      appendFileSync(profile_path, `\nexport ${name}="${val}"\n`)
       core.info(`${name}="${val} was added to "${profile_path}"`)
       return
     }

src/main.ts

@@ -3,7 +3,7 @@ import { delimiter } from "path"
 import * as core from "@actions/core"
 import execa from "execa"
 import { isGitHubCI } from "../env/isci"
-import untildify from "untildify"
+import { untildify_user as untildify } from "./untildify"
 import { appendFileSync } from "fs"
 
 /** An add path function that works locally or inside GitHub Actions */
@@ -34,7 +34,7 @@ function addPathSystem(path: string) {
     }
     case "linux":
     case "darwin": {
-      const profile_path = untildify("~/.profile")
+      const profile_path = untildify(".profile")
       appendFileSync(profile_path, `\nexport PATH=${path}:$PATH\n`)
       core.info(`${path} was added to "${profile_path}"`)
       return

src/utils/env/addEnv.ts

@@ -0,0 +1,12 @@
+import { join } from "path"
+import untildify from "untildify"
+import { isRoot } from "../env/sudo"
+
+export function untildify_user(path: string) {
+  if (isRoot() && typeof process.env.SUDO_USER === "string") {
+    // use the user profile even if root
+    return join("/home/", process.env.SUDO_USER, path)
+  } else {
+    return untildify(`~/${path}`)
+  }
+}