fix!: rename os-env to envosman due to npm conflict

aminya · aminya · commit d3b2f3531cbd · 2024-08-16T02:56:38.000-07:00
diff --git a/cspell.config.yaml b/cspell.config.yaml
@@ -14,6 +14,7 @@ words:
   - aarch
   - hadolint
   - aminya
+  - envosman
   - applellvm
   - biome
   - biomejs
diff --git a/dist/actions/setup-cpp.js b/dist/actions/setup-cpp.js
diff --git a/dist/actions/setup-cpp.js.map b/dist/actions/setup-cpp.js.map
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.js b/dist/modern/setup-cpp.js
diff --git a/dist/modern/setup-cpp.js.map b/dist/modern/setup-cpp.js.map
diff --git a/package.json b/package.json
@@ -103,7 +103,7 @@
     "npm-check-updates": "^17.0.6",
     "npm-run-all2": "^6.2.2",
     "numerous": "1.0.3",
-    "os-env": "workspace:*",
+    "envosman": "workspace:*",
     "p-timeout": "^6.1.2",
     "parcel": "2.12.0",
     "path-exists": "^5.0.0",
@@ -149,7 +149,7 @@
     "mri",
     "msvc-dev-cmd",
     "numerous",
-    "os-env",
+    "envosman",
     "path-exists",
     "patha",
     "retry-as-promised",
diff --git a/packages/envosman/.eslintrc.json b/packages/envosman/.eslintrc.json
diff --git a/packages/envosman/README.md b/packages/envosman/README.md
@@ -1,4 +1,4 @@
-<h1 align="center">os-env</h1>
+<h1 align="center">envosman</h1>
 <p>
   <img alt="Version" src="https://img.shields.io/badge/version-1.0.0-blue.svg?cacheSeconds=2592000" />
   <img src="https://img.shields.io/badge/node-%3E%3D12-blue.svg" />
@@ -12,7 +12,7 @@
 ## Install
 
 ```sh
-npm install --save os-env
+npm install --save envosman
 ```
 
 ## Usage
diff --git a/packages/envosman/package.json b/packages/envosman/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "os-env",
+  "name": "envosman",
   "version": "1.0.0",
   "description": "Manage environment variables, PATH, and rc files",
   "repository": "https://github.com/aminya/setup-cpp",
-  "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/os-env",
+  "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/envosman",
   "license": "Apache-2.0",
   "author": "Amin Yahyaabadi",
   "main": "./dist/index.js",
diff --git a/packages/envosman/src/add-env.ts b/packages/envosman/src/add-env.ts
diff --git a/packages/envosman/src/add-path.ts b/packages/envosman/src/add-path.ts
diff --git a/packages/envosman/src/escape-quotes.d.ts b/packages/envosman/src/escape-quotes.d.ts
diff --git a/packages/envosman/src/index.ts b/packages/envosman/src/index.ts
diff --git a/packages/envosman/src/rc-file.ts b/packages/envosman/src/rc-file.ts
@@ -43,8 +43,8 @@ export const sourceRCInRc = memoize(sourceRCInRc_, { isPromise: true })
 async function addRCHeader(options: RcOptions) {
   // a variable that prevents source rc from being called from .bashrc and .profile
   const rcHeader = options.guard === undefined
-    ? "\n# Automatically Generated by os-env\n"
-    : `\n# Automatically Generated by os-env ${options.guard}\nexport SOURCE_${options.guard.toUpperCase()}RC=0\n`
+    ? "\n# Automatically Generated by envosman\n"
+    : `\n# Automatically Generated by envosman ${options.guard}\nexport SOURCE_${options.guard.toUpperCase()}RC=0\n`
 
   if (await pathExists(options.rcPath)) {
     const rcContent = await readFile(options.rcPath, "utf8")
diff --git a/packages/envosman/src/utils.ts b/packages/envosman/src/utils.ts
diff --git a/packages/envosman/tsconfig.json b/packages/envosman/tsconfig.json
diff --git a/packages/setup-apt/package.json b/packages/setup-apt/package.json
@@ -20,7 +20,7 @@
     "ci-info": "^4.0.0",
     "path-exists": "^5.0.0",
     "ci-log": "workspace:*",
-    "os-env": "workspace:*",
+    "envosman": "workspace:*",
     "which": "4.0.0",
     "execa": "^7.2.0",
     "escape-string-regexp": "^5.0.0"
diff --git a/packages/setup-apt/src/alternatives.ts b/packages/setup-apt/src/alternatives.ts
@@ -1,8 +1,8 @@
 import { promises } from "fs"
 import { execRoot } from "admina"
 import { GITHUB_ACTIONS } from "ci-info"
-import { sourceRC } from "os-env"
-import type { RcOptions } from "os-env/dist/rc-file.js"
+import { sourceRC } from "envosman"
+import type { RcOptions } from "envosman/dist/rc-file.js"
 const { appendFile } = promises
 
 /**
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/brew/brew.ts b/src/brew/brew.ts
@@ -1,9 +1,9 @@
 import { tmpdir } from "os"
 import path, { join } from "path"
 import { mkdirP } from "@actions/io"
+import { addPath } from "envosman"
 import { execaSync } from "execa"
 import { readFile } from "fs/promises"
-import { addPath } from "os-env"
 import { dirname } from "patha"
 import which from "which"
 import { rcOptions } from "../cli-options.js"
diff --git a/src/chocolatey/chocolatey.ts b/src/chocolatey/chocolatey.ts
@@ -1,5 +1,5 @@
+import { addPath } from "envosman"
 import { execaSync } from "execa"
-import { addPath } from "os-env"
 import { pathExists } from "path-exists"
 import { dirname } from "patha"
 import which from "which"
diff --git a/src/compilers.ts b/src/compilers.ts
@@ -1,7 +1,7 @@
 import { join } from "path"
 import { endGroup, notice, startGroup } from "@actions/core"
 import { error, info } from "ci-log"
-import { addEnv } from "os-env"
+import { addEnv } from "envosman"
 import semverValid from "semver/functions/valid"
 import { getSuccessMessage, rcOptions } from "./cli-options.js"
 import { setupGcc, setupMingw } from "./gcc/gcc.js"
diff --git a/src/cppcheck/cppcheck.ts b/src/cppcheck/cppcheck.ts
@@ -1,4 +1,4 @@
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { installAptPack } from "setup-apt"
 import { rcOptions } from "../cli-options.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
diff --git a/src/doxygen/doxygen.ts b/src/doxygen/doxygen.ts
@@ -1,5 +1,5 @@
 import { info, notice } from "ci-log"
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { addExeExt, join } from "patha"
 import { installAptPack } from "setup-apt"
 import { setupGraphviz } from "../graphviz/graphviz.js"
diff --git a/src/gcc/gcc.ts b/src/gcc/gcc.ts
@@ -1,4 +1,4 @@
-import { addEnv, addPath } from "os-env"
+import { addEnv, addPath } from "envosman"
 
 import { GITHUB_ACTIONS } from "ci-info"
 import { info, warning } from "ci-log"
diff --git a/src/gcovr/gcovr.ts b/src/gcovr/gcovr.ts
@@ -1,4 +1,4 @@
-import { addEnv } from "os-env"
+import { addEnv } from "envosman"
 import semverMajor from "semver/functions/major"
 import semverValid from "semver/functions/valid"
 import { rcOptions } from "../cli-options.js"
diff --git a/src/graphviz/graphviz.ts b/src/graphviz/graphviz.ts
@@ -1,4 +1,4 @@
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { installAptPack } from "setup-apt"
 import { rcOptions } from "../cli-options.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
diff --git a/src/llvm/llvm.ts b/src/llvm/llvm.ts
@@ -1,8 +1,8 @@
 import { delimiter } from "path"
 import { GITHUB_ACTIONS } from "ci-info"
 import { info, warning } from "ci-log"
+import { addEnv } from "envosman"
 import memoize from "micro-memoize"
-import { addEnv } from "os-env"
 import { pathExists } from "path-exists"
 import { addExeExt, join } from "patha"
 import { addUpdateAlternativesToRc, installAptPack } from "setup-apt"
diff --git a/src/llvm/llvm_installer.ts b/src/llvm/llvm_installer.ts
@@ -1,8 +1,8 @@
 import { info } from "console"
 import { execRoot } from "admina"
+import { addPath } from "envosman"
 import { execa } from "execa"
 import { chmod, readFile, writeFile } from "fs/promises"
-import { addPath } from "os-env"
 import { aptTimeout, hasNala, installAptPack, isAptPackRegexInstalled } from "setup-apt"
 import { rcOptions } from "../cli-options.js"
 import { DEFAULT_TIMEOUT } from "../installTool.js"
diff --git a/src/macos-sdk/macos-sdk.ts b/src/macos-sdk/macos-sdk.ts
@@ -1,6 +1,6 @@
 import { getExecOutput } from "@actions/exec"
 import { error } from "ci-log"
-import { addEnv } from "os-env"
+import { addEnv } from "envosman"
 import { rcOptions } from "../cli-options.js"
 
 export async function setupMacOSSDK() {
diff --git a/src/main.ts b/src/main.ts
@@ -3,9 +3,9 @@
 
 import { GITHUB_ACTIONS, isCI } from "ci-info"
 import { error, info, success, warning } from "ci-log"
+import { finalizeRC } from "envosman"
 import * as numerous from "numerous"
 import numerousLocale from "numerous/locales/en.js"
-import { finalizeRC } from "os-env"
 import * as timeDelta from "time-delta"
 import timeDeltaLocale from "time-delta/locales/en.js"
 import { untildifyUser } from "untildify-user"
diff --git a/src/make/make.ts b/src/make/make.ts
@@ -1,4 +1,4 @@
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { installAptPack } from "setup-apt"
 import { rcOptions } from "../cli-options.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
diff --git a/src/opencppcoverage/opencppcoverage.ts b/src/opencppcoverage/opencppcoverage.ts
@@ -1,4 +1,4 @@
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { rcOptions } from "../cli-options.js"
 import { setupChocoPack } from "../utils/setup/setupChocoPack.js"
 
diff --git a/src/powershell/powershell.ts b/src/powershell/powershell.ts
@@ -1,5 +1,5 @@
 import { execRootSync } from "admina"
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { installAptPack } from "setup-apt"
 import { rcOptions } from "../cli-options.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
diff --git a/src/python/python.ts b/src/python/python.ts
@@ -4,10 +4,10 @@ import { parse as pathParse } from "path"
 import { getExecOutput } from "@actions/exec"
 import { GITHUB_ACTIONS } from "ci-info"
 import { info, warning } from "ci-log"
+import { addPath } from "envosman"
 import { execa } from "execa"
 import { readdir } from "fs/promises"
 import memoize from "micro-memoize"
-import { addPath } from "os-env"
 import { pathExists } from "path-exists"
 import { addExeExt, dirname, join } from "patha"
 import { installAptPack } from "setup-apt"
diff --git a/src/utils/setup/setupBin.ts b/src/utils/setup/setupBin.ts
@@ -1,6 +1,6 @@
 import { cacheDir, downloadTool, find } from "@actions/tool-cache"
 import { info } from "ci-log"
-import { addPath } from "os-env"
+import { addPath } from "envosman"
 import { join } from "patha"
 
 import { tmpdir } from "os"
diff --git a/src/utils/setup/setupChocoPack.ts b/src/utils/setup/setupChocoPack.ts
@@ -1,7 +1,7 @@
 /* eslint-disable require-atomic-updates */
 import { info } from "ci-log"
+import { addPath } from "envosman"
 import { execaSync } from "execa"
-import { addPath } from "os-env"
 import which from "which"
 import { setupChocolatey } from "../../chocolatey/chocolatey.js"
 import { rcOptions } from "../../cli-options.js"
diff --git a/src/utils/setup/setupPipPack.ts b/src/utils/setup/setupPipPack.ts
@@ -1,8 +1,8 @@
 import { info } from "@actions/core"
+import { addPath } from "envosman"
 import { execa, execaSync } from "execa"
 import memoize from "micro-memoize"
 import { mkdirp } from "mkdirp"
-import { addPath } from "os-env"
 import { pathExists } from "path-exists"
 import { addExeExt, dirname, join } from "patha"
 import { installAptPack } from "setup-apt"
diff --git a/src/vcpkg/vcpkg.ts b/src/vcpkg/vcpkg.ts
@@ -1,7 +1,7 @@
 import { grantUserWriteAccess } from "admina"
 import { info, notice } from "ci-log"
+import { addPath } from "envosman"
 import { execaSync } from "execa"
-import { addPath } from "os-env"
 import { pathExists } from "path-exists"
 import { addShExt, addShRelativePrefix, dirname, join } from "patha"
 import { installAptPack } from "setup-apt"
diff --git a/src/vcvarsall/vcvarsall.ts b/src/vcvarsall/vcvarsall.ts
@@ -1,8 +1,8 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { info } from "ci-log"
+import { addEnv } from "envosman"
 import { setupMSVCDevCmd } from "msvc-dev-cmd/lib.js"
-import { addEnv } from "os-env"
 import { pathExists } from "path-exists"
 import { rcOptions } from "../cli-options.js"
 
