@hurshb50/setup-ubuntu 1.1.0 → 1.1.2

package/README.md

@@ -8,7 +8,7 @@ Sets up a fresh Ubuntu machine with tools, configuration, and dotfiles.
 sudo apt update
 sudo apt install -y curl ca-certificates
 curl -fsSL https://vite.plus | bash
-vpx @hurshb50/setup-ubuntu
+vpx @hurshb50/setup-ubuntu@latest
 ```
 
 Vite+ defaults to pnpm, which can hold back freshly published releases. The setup pins npm globally, so later commands need no prefix.

package/distribution/assets/.bashrc

@@ -29,10 +29,6 @@ function path() {
     export PATH="$HOME/.local/bin:$PATH"
 }
 
-function package_manager() {
-    export VP_PACKAGE_MANAGER="npm@12"
-}
-
 function setup_history() {
     shopt -s histappend
     shopt -s checkwinsize
@@ -129,13 +125,16 @@ function fuzzy_finder() {
     fi
 }
 
+function typescript_toolchain() {
+    . "/home/hpatel/.config/vite-plus/env"
+}
+
 function run() {
     if ! is_interactive; then
         return
     fi
 
     path
-    package_manager
     load_auto_suggestion
     setup_history
     completion
@@ -146,6 +145,7 @@ function run() {
     disable_legacy
     swap_capslock_and_esc
     fuzzy_finder
+    typescript_toolchain
     start_auto_suggestion
 }
 

package/distribution/setup-ubuntu.mjs

@@ -7,10 +7,11 @@ import escapes from "ansi-escapes";
 import { setTimeout } from "timers/promises";
 import { stdout } from "process";
 import fs from "fs/promises";
-import { execa } from "execa";
+import util from "util";
+import childProcess from "child_process";
 //#region package.json
 var name = "@hurshb50/setup-ubuntu";
-var version = "1.0.3";
+var version = "1.1.1";
 //#endregion
 //#region source/modules/logger/logger.ts
 var Logger = class Logger {
@@ -160,10 +161,7 @@ var DependencyManager = class {
 	}
 	async commandExists(command) {
 		try {
-			await execa("command", ["-v", command], {
-				shell: true,
-				stdin: "ignore"
-			});
+			childProcess.execSync(`command -v ${command}`);
 			return true;
 		} catch {
 			const commandFilePath = path.join(os.homedir(), ".local", "bin", command);
@@ -171,28 +169,22 @@ var DependencyManager = class {
 		}
 	}
 	async isInstalled(dependencies) {
-		return (await Promise.all(dependencies.map(async (dependency) => {
+		const exec = util.promisify(childProcess.exec);
+		const queryCalls = dependencies.map(async (dependency) => {
 			try {
-				const { stdout } = await execa("dpkg-query", [
-					"--show",
-					"--showformat=${Status}",
-					dependency
-				]);
+				const { stdout } = await exec(`dpkg-query --show --showformat='\${Status}' ${dependency}`);
 				return stdout.includes("install ok installed");
 			} catch {
 				return false;
 			}
-		}))).every((installation) => installation === true);
+		});
+		return (await Promise.all(queryCalls)).every((query) => query === true);
 	}
 	async authenticate() {
 		if (await this.isAuthenticated()) return;
-		process.stdout.write("Administrator access is required to install packages. You may be prompted for your password.\n");
+		process.stdout.write("Administrator access is required to install packages. You may be prompted for your password.\n\n");
 		try {
-			await execa("sudo", ["--validate"], {
-				stdin: "inherit",
-				stdout: "inherit",
-				stderr: "inherit"
-			});
+			await util.promisify(childProcess.exec)("sudo --validate");
 		} catch (error) {
 			throw new Error("Administrator access was not granted. Run 'sudo --validate' and then run this tool again.", { cause: error });
 		}
@@ -210,7 +202,7 @@ var DependencyManager = class {
 	}
 	async isAuthenticated() {
 		try {
-			await execa("sudo", ["--non-interactive", "--validate"], { stdin: "ignore" });
+			await util.promisify(childProcess.exec)("sudo --non-interactive --validate");
 			return true;
 		} catch {
 			return false;
@@ -219,12 +211,16 @@ var DependencyManager = class {
 	enqueue(managerArguments, task) {
 		const operation = this.queue.then(async () => {
 			if (!await this.isAuthenticated()) throw new Error("Administrator access is no longer available for apt-get. Run 'sudo --validate' and then run this tool again.");
-			const subprocess = execa("sudo", [
+			const subprocess = childProcess.spawn("sudo", [
 				"env",
 				...["DEBIAN_FRONTEND=noninteractive", "NEEDRESTART_SUSPEND=1"],
 				"apt-get",
 				...managerArguments
-			], { stdin: "ignore" });
+			], { stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			] });
 			let partial = "";
 			const track = (chunk) => {
 				partial += chunk.toString();
@@ -233,9 +229,12 @@ var DependencyManager = class {
 				const line = lines.at(-1)?.trim();
 				if (line) task.continue(line);
 			};
-			subprocess.stdout?.on("data", track);
-			subprocess.stderr?.on("data", track);
-			await subprocess;
+			subprocess.stdout.on("data", track);
+			subprocess.stderr.on("data", track);
+			await new Promise((resolve, reject) => {
+				subprocess.once("error", reject);
+				subprocess.once("close", (code) => code === 0 ? resolve() : reject(/* @__PURE__ */ new Error(`apt-get exited with code ${code}`)));
+			});
 		});
 		this.queue = operation.catch(() => {});
 		return operation;
@@ -322,9 +321,10 @@ var AutoSuggestion = class {
 			const temporaryDirectoryPath = await fs.mkdtemp(path.join(os.tmpdir(), "ble.sh"));
 			const installationFilePath = path.join(temporaryDirectoryPath, "ble-nightly", "ble.sh");
 			task.continue("Download ble.sh");
-			await execa(`curl -L https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly.tar.xz | tar xJf - -C ${temporaryDirectoryPath}`, { shell: true });
+			const exec = util.promisify(childProcess.exec);
+			await exec(`curl -L https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly.tar.xz | tar xJf - -C ${temporaryDirectoryPath}`);
 			task.continue("Install ble.sh");
-			await execa(`bash ${installationFilePath} --install ${destinationDirectoryPath}`, { shell: true });
+			await exec(`bash ${installationFilePath} --install ${destinationDirectoryPath}`);
 			task.continue("Remove temporary directory");
 			await fs.rm(temporaryDirectoryPath, { recursive: true });
 		}
@@ -353,8 +353,9 @@ var Browser = class {
 		const keyringFilePath = path.join("/", "usr", "share", "keyrings", "google-chrome.gpg");
 		const sourceFilePath = path.join("/", "etc", "apt", "sources.list.d", "google-chrome.list");
 		task.continue("Set up google chrome sources");
-		await execa(`curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor --yes -o ${keyringFilePath}`, { shell: true });
-		await execa(`echo 'deb [arch=amd64 signed-by=${keyringFilePath}] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee ${sourceFilePath} > /dev/null`, { shell: true });
+		const exec = util.promisify(childProcess.exec);
+		await exec(`curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor --yes -o ${keyringFilePath}`);
+		await exec(`echo 'deb [arch=amd64 signed-by=${keyringFilePath}] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee ${sourceFilePath} > /dev/null`);
 		task.continue("Update package manager");
 		await context.dependencyManager.update(task);
 		task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
@@ -372,7 +373,7 @@ var CodeEditor = class {
 		const sourceDirectoryPath = path.join(context.directories.assets, "zed");
 		const destinationDirectoryPath = path.join(context.directories.home, ".config", "zed");
 		task.continue("Install Zed");
-		if (!await context.dependencyManager.commandExists("zed")) await execa("curl -f https://zed.dev/install.sh | sh", { shell: true });
+		if (!await context.dependencyManager.commandExists("zed")) await util.promisify(childProcess.exec)("curl -f https://zed.dev/install.sh | sh");
 		task.continue("Copy configuration");
 		await fs.cp(sourceDirectoryPath, destinationDirectoryPath, {
 			recursive: true,
@@ -401,8 +402,9 @@ var CodeHost = class {
 		const keyringFilePath = path.join("/", "usr", "share", "keyrings", "github-cli.gpg");
 		const sourceFilePath = path.join("/", "etc", "apt", "sources.list.d", "github-cli.list");
 		task.continue("Set up github cli sources");
-		await execa(`curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.asc | sudo gpg --dearmor --yes -o ${keyringFilePath}`, { shell: true });
-		await execa(`echo "deb [arch=$(dpkg --print-architecture) signed-by=${keyringFilePath}] https://cli.github.com/packages stable main" | sudo tee ${sourceFilePath} > /dev/null`, { shell: true });
+		const exec = util.promisify(childProcess.exec);
+		await exec(`curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.asc | sudo gpg --dearmor --yes -o ${keyringFilePath}`);
+		await exec(`echo "deb [arch=$(dpkg --print-architecture) signed-by=${keyringFilePath}] https://cli.github.com/packages stable main" | sudo tee ${sourceFilePath} > /dev/null`);
 		task.continue("Update package manager");
 		await context.dependencyManager.update(task);
 		task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
@@ -436,14 +438,15 @@ var ContainerEngine = class {
 		const keyringFilePath = path.join("/", "usr", "share", "keyrings", "docker.gpg");
 		const sourceFilePath = path.join("/", "etc", "apt", "sources.list.d", "docker.list");
 		task.continue("Set up docker sources");
-		await execa(`curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor --yes -o ${keyringFilePath}`, { shell: true });
-		await execa(`echo "deb [arch=$(dpkg --print-architecture) signed-by=${keyringFilePath}] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo $VERSION_CODENAME) stable" | sudo tee ${sourceFilePath} > /dev/null`, { shell: true });
+		const exec = util.promisify(childProcess.exec);
+		await exec(`curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor --yes -o ${keyringFilePath}`);
+		await exec(`echo "deb [arch=$(dpkg --print-architecture) signed-by=${keyringFilePath}] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo $VERSION_CODENAME) stable" | sudo tee ${sourceFilePath} > /dev/null`);
 		task.continue("Update package manager");
 		await context.dependencyManager.update(task);
 		task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
 		await context.dependencyManager.install(dependencies, task);
 		task.continue("Add user to docker group");
-		await execa(`sudo usermod --append --groups docker ${os.userInfo().username}`, { shell: true });
+		await exec(`sudo usermod --append --groups docker ${os.userInfo().username}`);
 		task.finish();
 	}
 };
@@ -499,7 +502,7 @@ var PasswordManager = class {
 		const task = new Task("Password Manager");
 		context.logger.add(task);
 		task.start();
-		const dependencies = ["libasound2t64", "1password"];
+		const dependencies = [alsaPackageName(await fs.readFile(path.join("/", "etc", "os-release"), "utf8")), "1password"];
 		if (await context.dependencyManager.isInstalled(dependencies)) {
 			task.finish();
 			return;
@@ -516,12 +519,13 @@ var PasswordManager = class {
 		const debsigKeyringDirectoryPath = path.join("/", "usr", "share", "debsig", "keyrings", "AC2D62742012EA22");
 		const debsigKeyringFilePath = path.join(debsigKeyringDirectoryPath, "debsig.gpg");
 		task.continue("Set up 1password sources");
-		await execa(`curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --yes --output ${keyringFilePath}`, { shell: true });
-		await execa(`echo 'deb [arch=amd64 signed-by=${keyringFilePath}] https://downloads.1password.com/linux/debian/amd64 stable main' | sudo tee ${sourceFilePath}`, { shell: true });
-		await execa(`sudo mkdir -p ${policyDirectoryPath}`, { shell: true });
-		await execa(`curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | sudo tee ${policyFilePath}`, { shell: true });
-		await execa(`sudo mkdir -p ${debsigKeyringDirectoryPath}`, { shell: true });
-		await execa(`curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --yes --output ${debsigKeyringFilePath}`, { shell: true });
+		const exec = util.promisify(childProcess.exec);
+		await exec(`curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --yes --output ${keyringFilePath}`);
+		await exec(`echo 'deb [arch=amd64 signed-by=${keyringFilePath}] https://downloads.1password.com/linux/debian/amd64 stable main' | sudo tee ${sourceFilePath}`);
+		await exec(`sudo mkdir -p ${policyDirectoryPath}`);
+		await exec(`curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | sudo tee ${policyFilePath}`);
+		await exec(`sudo mkdir -p ${debsigKeyringDirectoryPath}`);
+		await exec(`curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --yes --output ${debsigKeyringFilePath}`);
 		task.continue("Update package manager");
 		await context.dependencyManager.update(task);
 		task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
@@ -529,6 +533,10 @@ var PasswordManager = class {
 		task.finish();
 	}
 };
+function alsaPackageName(osRelease) {
+	const versionId = osRelease.match(/^VERSION_ID="?([\d.]+)"?$/m)?.[1];
+	return Number.parseInt(versionId ?? "", 10) >= 24 ? "libasound2t64" : "libasound2";
+}
 //#endregion
 //#region source/modules/shell-configuration/shell-configuration.ts
 var ShellConfiguration = class {
@@ -576,7 +584,7 @@ var TerminalView = class {
 			task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
 			await context.dependencyManager.install(dependencies, task);
 			task.continue("Install oh-my-posh");
-			await execa("curl -s https://ohmyposh.dev/install.sh | bash -s", { shell: true });
+			await util.promisify(childProcess.exec)("curl -s https://ohmyposh.dev/install.sh | bash -s");
 		}
 		const sourceFilePath = path.join(context.directories.assets, "oh-my-posh.toml");
 		const destinationDirectoryPath = path.join(context.directories.home, ".config", "oh-my-posh");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hurshb50/setup-ubuntu",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "type": "module",
   "files": [
     "distribution"
@@ -10,12 +10,9 @@
   },
   "dependencies": {
     "@commander-js/extra-typings": "^15.0.0",
+    "@types/node": "latest",
     "ansi-escapes": "^7.3.0",
     "ansi-styles": "^7.0.0",
-    "execa": "^10.0.1"
-  },
-  "devDependencies": {
-    "@types/node": "latest",
     "typescript": "^7.0.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.1",
     "vite-plus": "^0.2.4",
@@ -26,13 +23,13 @@
   },
   "devEngines": {
     "runtime": {
-      "name": "bun",
-      "version": "1.4.2",
+      "name": "node",
+      "version": "24.21.0",
       "onFail": "download"
     },
     "packageManager": {
       "name": "pnpm",
-      "version": "12.5.1",
+      "version": "12.6.0",
       "onFail": "download"
     }
   },
@@ -55,7 +52,7 @@
     "check": "vp check",
     "fix": "vp check --fix",
     "unit-test": "vp test --project unit",
-    "integration-test": "bun scripts/integration.ts",
-    "end-to-end-test": "bun scripts/end-to-end.ts"
+    "integration-test": "node scripts/integration.ts",
+    "end-to-end-test": "node scripts/end-to-end.ts"
   }
 }