chore: update setup script configuration and dependencies
This commit is contained in:
@@ -195,10 +195,16 @@ install_git() {
|
|||||||
|
|
||||||
# ─── Homebrew ─────────────────────────────────────────────────────────────────
|
# ─── Homebrew ─────────────────────────────────────────────────────────────────
|
||||||
install_homebrew() {
|
install_homebrew() {
|
||||||
|
# Check PATH first, then the well-known linuxbrew location
|
||||||
if command -v brew &>/dev/null; then
|
if command -v brew &>/dev/null; then
|
||||||
success "Homebrew already installed"
|
success "Homebrew already installed"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
|
||||||
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
|
success "Homebrew already installed (added to PATH)"
|
||||||
|
return
|
||||||
|
fi
|
||||||
info "Installing Homebrew ..."
|
info "Installing Homebrew ..."
|
||||||
local install_script
|
local install_script
|
||||||
install_script="$(mktemp)"
|
install_script="$(mktemp)"
|
||||||
@@ -331,8 +337,12 @@ install_docker() {
|
|||||||
else
|
else
|
||||||
curl -fsSL https://git.mitsea.com/FlintyLemming/scripts-public/raw/branch/main/linux-managements/install-docker.sh \
|
curl -fsSL https://git.mitsea.com/FlintyLemming/scripts-public/raw/branch/main/linux-managements/install-docker.sh \
|
||||||
-o /tmp/install-docker.sh
|
-o /tmp/install-docker.sh
|
||||||
psudo sh /tmp/install-docker.sh
|
if psudo sh /tmp/install-docker.sh; then
|
||||||
success "Docker installed"
|
success "Docker installed"
|
||||||
|
else
|
||||||
|
warn "Docker installation failed (packages may not be available for this release)."
|
||||||
|
warn "Skipping Docker — please install manually later."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
fedora)
|
fedora)
|
||||||
@@ -342,14 +352,21 @@ install_docker() {
|
|||||||
info "Setting up Docker CE repository ..."
|
info "Setting up Docker CE repository ..."
|
||||||
psudo curl -fsSL https://download.docker.com/linux/fedora/docker-ce.repo \
|
psudo curl -fsSL https://download.docker.com/linux/fedora/docker-ce.repo \
|
||||||
-o /etc/yum.repos.d/docker-ce.repo
|
-o /etc/yum.repos.d/docker-ce.repo
|
||||||
psudo dnf install -y docker-ce docker-ce-cli containerd.io \
|
if psudo dnf install -y docker-ce docker-ce-cli containerd.io \
|
||||||
docker-compose-plugin docker-buildx-plugin
|
docker-compose-plugin docker-buildx-plugin; then
|
||||||
success "Docker installed"
|
success "Docker installed"
|
||||||
|
else
|
||||||
|
warn "Docker installation failed (packages may not be available for this release)."
|
||||||
|
warn "Skipping Docker — please install manually later."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
docker_no_root
|
# Only configure docker group/service if docker was actually installed
|
||||||
|
if command -v docker &>/dev/null; then
|
||||||
|
docker_no_root
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Allow current user to run docker without sudo
|
# Allow current user to run docker without sudo
|
||||||
@@ -546,11 +563,13 @@ main() {
|
|||||||
configure_fish_dotfiles
|
configure_fish_dotfiles
|
||||||
configure_ssh_config
|
configure_ssh_config
|
||||||
|
|
||||||
step "Starting Docker"
|
if command -v docker &>/dev/null; then
|
||||||
if psudo systemctl start docker; then
|
step "Starting Docker"
|
||||||
success "Docker started"
|
if psudo systemctl start docker; then
|
||||||
else
|
success "Docker started"
|
||||||
warn "Could not start Docker — please start it manually"
|
else
|
||||||
|
warn "Could not start Docker — please start it manually"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Stop sudo keepalive
|
# Stop sudo keepalive
|
||||||
|
|||||||
Reference in New Issue
Block a user