Merge pull request #121 from aminya/admina [skip ci]

ignored-error-codes.json

@@ -1 +1 @@
-["TS6133", "TS7010"]
+["TS6133"]

loosely-type-checked-files.json

@@ -1 +1 @@
-["node_modules/setup-python/src/cache-distributions/poetry-cache.ts", "node_modules/time-delta/types/index.d.ts"]
+["node_modules/setup-python/src/cache-distributions/poetry-cache.ts"]

package.json

@@ -55,6 +55,7 @@
     "@actions/io": "^1.1.2",
     "@actions/tool-cache": "^2.0.1",
     "@npmcli/ci-detect": "github:aminya/ci-detect#37fe40075bebec96794ba0a7c4a6d5c70cbea00d",
+    "admina": "^0.1.1",
     "ci-log": "workspace:1.0.0",
     "escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3",
     "exec-powershell": "workspace:1.0.0",
@@ -64,7 +65,6 @@
     "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
     "numerous": "1.0.3",
     "patha": "^0.4.0",
-    "root-tools": "workspace:1.0.0",
     "semver": "7.3.7",
     "setup-python": "github:actions/setup-python#c474c82340438924daab9282d07300bfe7e3692d",
     "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
@@ -75,9 +75,9 @@
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.2",
-    "@types/jest": "^28.1.7",
+    "@types/jest": "^28.1.8",
     "@types/mri": "^1.1.1",
-    "@types/node": "^18.7.9",
+    "@types/node": "^18.7.13",
     "@types/semver": "^7.3.12",
     "@types/which": "^2.0.1",
     "caxa": "^2.1.0",
@@ -87,7 +87,7 @@
     "eslint": "^8.22.0",
     "eslint-config-atomic": "^1.18.1",
     "gen-readme": "^1.6.0",
-    "jest": "^28.1.3",
+    "jest": "^29.0.0",
     "loose-ts-check": "^1.2.0",
     "npm-check-updates": "^16.0.5",
     "npm-run-all2": "^6.0.2",
@@ -99,7 +99,7 @@
     "terser-config-atomic": "^0.1.1",
     "ts-jest": "^28.0.8",
     "ts-readme": "^1.1.3",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   },
   "engines": {
     "node": ">=12.x"

packages/ci-log/package.json

@@ -11,7 +11,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@actions/core": "^1.9.0",
+    "@actions/core": "^1.9.1",
     "@npmcli/ci-detect": "github:aminya/ci-detect#37fe40075bebec96794ba0a7c4a6d5c70cbea00d"
   },
   "keywords": [

packages/root-tools/README.md

@@ -1,76 +0,0 @@
-<h1 align="center">root-tools</h1>
-<p>
-  <img alt="Version" src="https://img.shields.io/badge/version-1.0.0-blue.svg?cacheSeconds=2592000" />
-  <a href="#" target="_blank">
-    <img alt="License: Apache--2.0" src="https://img.shields.io/badge/License-Apache--2.0-yellow.svg" />
-  </a>
-</p>
-
-> Tools for working with root and sudo such as executing command as root, detecting root, etc.
-
-## Install
-
-```sh
-npm install --save root-tools
-```
-
-## Usage
-
-<!-- INSERT GENERATED DOCS START -->
-
-### `isSudo` (function)
-
-Detect if sudo is available and the user has root privileges
-
-**returns:** boolean
-
-### `isRoot` (function)
-
-Detect if the process has root privileges
-
-**returns:** boolean
-
-### `prependSudo` (function)
-
-Prepend `sudo` to the command if sudo is available
-
-**Parameters:**
-
-- command (`string`)
-
-**returns:** string
-
-### `execRootSync` (function)
-
-Execute a command as root if sudo is available. Otherwise executes the command normally without sudo.
-
-**Parameters:**
-
-- program (`string`) - The program to spawn
-- args (`string[]`) - The command arguments
-- execOptions (`execa.SyncOptions`) - The options passed to `execa`. Defaults to `{ stdio: "inherit", shell: true }`
-
-**returns:** execa.ExecaSyncReturnValue<string>
-
-### `execRoot` (function)
-
-Asynchronously execute a command as root if sudo is available. Otherwise executes the command normally without sudo.
-
-**Parameters:**
-
-- program (`string`) - The program to spawn
-- args (`string[]`) - The command arguments
-- execOptions (`execa.Options`) - The options passed to `execa`. Defaults to `{ stdio: "inherit", shell: true }`
-
-**returns:** execa.ExecaChildProcess<string>
-
-<!-- INSERT GENERATED DOCS END -->
-
-## 🤝 Contributing
-
-You can sponsor my work here:
-
-https://github.com/sponsors/aminya
-
-Pull requests, issues and feature requests are welcome.
-See the [Contributing guide](https://github.com/aminya/setup-cpp/blob/master/CONTRIBUTING.md).

packages/root-tools/package.json

@@ -1,41 +0,0 @@
-{
-  "name": "root-tools",
-  "version": "1.0.0",
-  "description": "Tools for working with root and sudo such as executing command as root, detecting root, etc.",
-  "homepage": "https://github.com/aminya/setup-cpp",
-  "license": "Apache-2.0",
-  "author": "Amin Yahyaabadi",
-  "main": "./dist/index.js",
-  "source": "./src/index.ts",
-  "scripts": {
-    "build": "tsc"
-  },
-  "dependencies": {
-    "execa": "^5.1.1",
-    "which": "^2.0.2"
-  },
-  "devDependencies": {
-    "@types/which": "^2.0.1"
-  },
-  "keywords": [
-    "sudo",
-    "root",
-    "is-root",
-    "is-sudo",
-    "exec-sudo",
-    "exec-root",
-    "isroot",
-    "issudo",
-    "exec",
-    "execa",
-    "spawn",
-    "system",
-    "unix",
-    "linux",
-    "github-actions",
-    "github",
-    "actions",
-    "gitlab",
-    "ci"
-  ]
-}

packages/root-tools/src/index.ts

@@ -1,60 +0,0 @@
-import which from "which"
-import execa from "execa"
-
-/** Detect if sudo is available and the user has root privileges */
-export function isSudo(): boolean {
-  return (Boolean(process.env.CI) || isRoot()) && which.sync("sudo", { nothrow: true }) !== null
-}
-
-/** Detect if the process has root privileges */
-export function isRoot(): boolean {
-  return process.getuid?.() === 0
-}
-
-/** Prepend `sudo` to the command if sudo is available */
-export function prependSudo(command: string) {
-  if (isSudo()) {
-    return `sudo ${command}`
-  }
-  return command
-}
-
-/**
- * Execute a command as root if sudo is available. Otherwise executes the command normally without sudo.
- *
- * @param program The program to spawn
- * @param args The command arguments
- * @param execOptions The options passed to `execa`. Defaults to `{ stdio: "inherit", shell: true }`
- * @returns The execution result
- */
-export function execRootSync(
-  program: string,
-  args: string[] = [],
-  execOptions: execa.SyncOptions = { stdio: "inherit", shell: true }
-): execa.ExecaSyncReturnValue<string> {
-  if (isSudo()) {
-    return execa.commandSync(`sudo ${[program, ...args].map((arg) => `'${arg}'`).join(" ")}`, execOptions)
-  } else {
-    return execa.sync(program, args, execOptions)
-  }
-}
-
-/**
- * Asynchronously execute a command as root if sudo is available. Otherwise executes the command normally without sudo.
- *
- * @param program The program to spawn
- * @param args The command arguments
- * @param execOptions The options passed to `execa`. Defaults to `{ stdio: "inherit", shell: true }`
- * @returns A promise to the execution result
- */
-export function execRoot(
-  program: string,
-  args: string[] = [],
-  execOptions: execa.Options = { stdio: "inherit", shell: true }
-): execa.ExecaChildProcess<string> {
-  if (isSudo()) {
-    return execa.command(`sudo ${[program, ...args].map((arg) => `'${arg}'`).join(" ")}`, execOptions)
-  } else {
-    return execa(program, args, execOptions)
-  }
-}

packages/root-tools/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./dist"
-  },
-  "include": ["./src"]
-}

packages/untildify-user/package.json

@@ -11,7 +11,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "root-tools": "workspace:*",
+    "admina": "0.1.1",
     "untildify": "^4.0.0"
   },
   "keywords": [

packages/untildify-user/src/index.ts

@@ -1,6 +1,6 @@
 import { join } from "path"
 import untildify from "untildify"
-import { isSudo } from "root-tools"
+import { isSudo } from "admina"
 
 export function untildifyUser(path: string) {
   if (isSudo() && typeof process.env.SUDO_USER === "string") {

packages/user-access/package.json

@@ -11,7 +11,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "root-tools": "workspace:*"
+    "admina": "0.1.1"
   },
   "keywords": [
     "chown",

packages/user-access/src/index.ts

@@ -1,4 +1,4 @@
-import { isSudo, execRootSync } from "root-tools"
+import { isSudo, execRootSync } from "admina"
 
 /**
  * Give the user access to the given path and its sub-directories. It changes the owner to the SUDO_USER. This allows

src/bazel/bazel.ts

@@ -5,7 +5,7 @@ import { isArch } from "../utils/env/isArch"
 import { hasDnf } from "../utils/env/hasDnf"
 import { setupDnfPack } from "../utils/setup/setupDnfPack"
 import { isUbuntu } from "../utils/env/isUbuntu"
-import { execRootSync } from "root-tools"
+import { execRootSync } from "admina"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function setupBazel(version: string, _setupDir: string, _arch: string) {

src/nala/nala.ts

@@ -1,7 +1,7 @@
 import { dirname } from "patha"
 import which from "which"
 import { isUbuntu } from "../utils/env/isUbuntu"
-import { execRootSync } from "root-tools"
+import { execRootSync } from "admina"
 import { addAptKeyViaDownload, setupAptPack } from "../utils/setup/setupAptPack"
 
 let binDir: string | undefined

src/powershell/powershell.ts

@@ -7,7 +7,7 @@ import { isArch } from "../utils/env/isArch"
 import { hasDnf } from "../utils/env/hasDnf"
 import { setupDnfPack } from "../utils/setup/setupDnfPack"
 import { isUbuntu } from "../utils/env/isUbuntu"
-import { execRootSync } from "root-tools"
+import { execRootSync } from "admina"
 import { ubuntuVersion } from "../utils/env/ubuntu_version"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/utils/setup/setupAptPack.ts

@@ -1,6 +1,6 @@
 /* eslint-disable require-atomic-updates */
 import { InstallationInfo } from "./setupBin"
-import { execRootSync } from "root-tools"
+import { execRootSync } from "admina"
 import { info } from "@actions/core"
 import ciDetect from "@npmcli/ci-detect"
 import { addEnv, cpprc_path, setupCppInProfile } from "../env/addEnv"

src/utils/setup/setupDnfPack.ts

@@ -1,6 +1,6 @@
 /* eslint-disable require-atomic-updates */
 import { InstallationInfo } from "./setupBin"
-import { execRootSync } from "root-tools"
+import { execRootSync } from "admina"
 import { info, warning } from "ci-log"
 
 // let didUpdate: boolean = false

src/utils/setup/setupPacmanPack.ts

@@ -1,6 +1,6 @@
 /* eslint-disable require-atomic-updates */
 import { InstallationInfo } from "./setupBin"
-import { execRootSync } from "root-tools"
+import { execRootSync } from "admina"
 import { info } from "ci-log"
 
 let didUpdate: boolean = false

tsconfig.json

@@ -16,7 +16,7 @@
     "inlineSources": true,
     "preserveSymlinks": true,
     "removeComments": false,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "lib": ["ES2020", "dom"],
     "target": "ES2020",
     "allowJs": true,