From 3acc78e3b65ef4b9f1b5f68aadcacd01eadf31e1 Mon Sep 17 00:00:00 2001 From: MangoPig Date: Wed, 3 Dec 2025 07:34:41 +0000 Subject: [PATCH] Fix --- provision.sh | 7 ++++++- setup.sh | 12 +++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/provision.sh b/provision.sh index dae3c32..22ebb9e 100755 --- a/provision.sh +++ b/provision.sh @@ -20,6 +20,9 @@ if [ -f /etc/os-release ]; then OS=$ID fi +# IP Address Retrieval +IP=$(hostname -I | awk '{print $1}') + # Install Prerequisites (Git, Make, Zsh, Sudo) echo -e "${YELLOW}LOG: Updating system and installing base tools...${NC}" @@ -86,4 +89,6 @@ echo -e "${YELLOW}LOG: Cloning dotfiles for $USERNAME...${NC}" sudo -u "$USERNAME" git clone https://git.mangopig.tech/MangoPig/Dot-Zsh.git "/home/$USERNAME/Config/Dot-Zsh" -echo -e "${GREEN}✅ Server Provisioned! Log out and SSH as $USERNAME.${NC}" \ No newline at end of file +echo -e "${GREEN}✅ Server Provisioned!" +echo -e "${GREEN} sudo su - $USERNAME${NC} OR logout and SSH back in as $USERNAME@$IP.${NC}" +echo -e "${GREEN} Then run 'cd ~/Config/Dot-Zsh && make setup'{NC}" \ No newline at end of file diff --git a/setup.sh b/setup.sh index 0ff8584..1de571e 100755 --- a/setup.sh +++ b/setup.sh @@ -231,12 +231,14 @@ if command -v nvm &> /dev/null; then fi # 2. Setup Go (GVM) -[[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm" # Force load GVM +unalias cd 2>/dev/null || true + +[[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm" if command -v gvm &> /dev/null; then TARGET_GO="go1.24.11" if [[ $(gvm list) != *"$TARGET_GO"* ]]; then - echo -e "${BLUE} LOG:${YELLOW} Installing Go ($TARGET_GO)...${NC}" + gvm install $TARGET_GO gvm use $TARGET_GO --default fi @@ -252,8 +254,4 @@ if command -v rustup &> /dev/null; then fi # Finish -echo -e "${GREEN} LOG: Setup Complete! Please restart your terminal to apply all changes.${NC}" -echo -e "${GREEN} You may need to log out and back in for Docker group changes to take effect.${NC}" -echo -e "${GREEN} Setup GVM by running 'gvm listall' then 'gvm install [version], and 'gvm use [version] --default'.${NC}" -echo -e "${GREEN} Setup NVM by running 'nvm install --lts' and 'nvm use --lts'${NC}" -echo -e "${GREEN} Setup Rust by running 'rustup default stable'${NC}" \ No newline at end of file +echo -e "${GREEN} LOG: Setup Complete! Please restart your terminal to apply all changes.${NC}" \ No newline at end of file