From 5803376722d66acea77d3ad81d99c3db964d2b49 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Wed, 15 Jan 2025 13:36:17 +0100 Subject: [PATCH] update installation message to instruct users to reopen shell and rerun the script after Nix installation --- setup.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/setup.sh b/setup.sh index c283cb5..275f9fa 100755 --- a/setup.sh +++ b/setup.sh @@ -300,8 +300,8 @@ install_nix() { die "Failed to install Nix" fi - log_success "Nix has been installed. We're reinvoking the script to continue setup." - curl -L https://df.mvl.sh | bash -s - -c + log_success "Nix has been installed. Please open a new shell and re-run the script." + log_info "`~/dotfiles/setup.sh --continue` to continue setup." exit 0 } @@ -455,10 +455,15 @@ main() { git clone "$GIT_REPO" "$DOTFILES_DIR" || die "Failed to clone dotfiles repository" fi - warning_prompt - prepare_hostname - check_selinux - install_nix + if [ "$1" = "--continue" ]; then + log_info "Continuing setup..." + else + warning_prompt + prepare_hostname + check_selinux + install_nix + fi + install_home_manager setup_symlinks