From 11e2bc95a701527375e89fbca3d622abd964e2be Mon Sep 17 00:00:00 2001 From: Andrejus Date: Mon, 19 May 2025 23:09:17 +0300 Subject: [PATCH] fix: installs - skip docker setup - no sudo in stow - brew variables - ssh logs - node 20->22 --- script/install.d/01-ssh.sh | 2 ++ script/install.d/02-brew.sh | 17 ++++++++++++++--- script/install.d/06-stow.sh | 6 +++--- script/install.d/12-node.sh | 6 +++--- script/install.d/20-docker.sh | 12 ++++++++++++ 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/script/install.d/01-ssh.sh b/script/install.d/01-ssh.sh index 911fe29..4edd385 100644 --- a/script/install.d/01-ssh.sh +++ b/script/install.d/01-ssh.sh @@ -27,4 +27,6 @@ if [ -z "$SKIP_SSH_CONFIG" ]; then cat $ssh_pub unset ssh_method ssh_target ssh_key ssh_pub +else + echo "Skipping SSH configuration" fi diff --git a/script/install.d/02-brew.sh b/script/install.d/02-brew.sh index c95bd8a..2f61e54 100644 --- a/script/install.d/02-brew.sh +++ b/script/install.d/02-brew.sh @@ -6,7 +6,15 @@ # if [[ "$OSTYPE" == "darwin"* ]]; then + if [ -d "/opt/homebrew/bin" ]; then + export PATH="/opt/homebrew/bin:$PATH" + fi export NONINTERACTIVE=1 + export HOMEBREW_NO_ANALYTICS=1 + export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 + export HOMEBREW_NO_ENV_HINTS=1 + export HOMEBREW_NO_AUTO_UPDATE=1 + export HOMEBREW_NO_INSTALL_CLEANUP=1 if ! command -v brew &> /dev/null; then echo "Installing Homebrew..." bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -14,11 +22,14 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "Homebrew is already installed." fi - - brew update brew --version - unset NONINTERACTIVE + unset NONINTERACTIVE \ + HOMEBREW_NO_ANALYTICS \ + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK \ + HOMEBREW_NO_ENV_HINTS \ + HOMEBREW_NO_AUTO_UPDATE \ + HOMEBREW_NO_INSTALL_CLEANUP else echo "Skipping: Not macOS" fi diff --git a/script/install.d/06-stow.sh b/script/install.d/06-stow.sh index 568491f..09a2250 100644 --- a/script/install.d/06-stow.sh +++ b/script/install.d/06-stow.sh @@ -28,6 +28,6 @@ rm -f $HOME/.ssh/config mkdir -p $HOME/.config mkdir -p $HOME/.ssh -sudo stow --dir="$root_dir/files" --target="$HOME" home -sudo stow --dir="$root_dir/files" --target="$HOME/.config" dot-config -sudo stow --dir="$root_dir/files" --target="$HOME/.ssh" dot-ssh +stow --dir="$root_dir/files" --target="$HOME" home +stow --dir="$root_dir/files" --target="$HOME/.config" dot-config +stow --dir="$root_dir/files" --target="$HOME/.ssh" dot-ssh diff --git a/script/install.d/12-node.sh b/script/install.d/12-node.sh index 61bf692..2a3a96d 100644 --- a/script/install.d/12-node.sh +++ b/script/install.d/12-node.sh @@ -15,9 +15,9 @@ if ! command -v "nvm" &>/dev/null; then fi nvm --version -nvm alias default lts/iron -nvm install lts/iron -nvm use lts/iron +nvm alias default lts/jod +nvm install lts/jod +nvm use lts/jod echo "Node.js $(node --version)" diff --git a/script/install.d/20-docker.sh b/script/install.d/20-docker.sh index abd44c4..846646c 100644 --- a/script/install.d/20-docker.sh +++ b/script/install.d/20-docker.sh @@ -11,6 +11,16 @@ if [[ -n "$WSL_DISTRO_NAME" ]]; then export SKIP_DOCKER_CONFIG=1 fi +# skip if in CODESPACES +if [[ -n "$CODESPACES" ]]; then + export SKIP_DOCKER_CONFIG=1 +fi + +# skip on mac +if [[ "$OSTYPE" == "darwin"* ]]; then + export SKIP_DOCKER_CONFIG=1 +fi + if [[ -z "$SKIP_DOCKER_CONFIG" ]]; then if [[ "$OSTYPE" == "linux-gnu"* ]]; then if ! command -v docker &> /dev/null; then @@ -43,4 +53,6 @@ if [[ -z "$SKIP_DOCKER_CONFIG" ]]; then fi fi docker --version +else + echo "Skipping Docker configuration" fi