From e6933f33effd208222ec7d39a5cdc418c71fe314 Mon Sep 17 00:00:00 2001 From: Max Richter Date: Wed, 11 Oct 2023 17:13:26 +0200 Subject: [PATCH] fix: some stuff --- .dotfiles/helpers/asdf-install.sh | 2 ++ .dotfiles/install/asdf.sh | 1 + .dotfiles/setup.sh | 3 ++- install.sh | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.dotfiles/helpers/asdf-install.sh b/.dotfiles/helpers/asdf-install.sh index 0953928..9ff0f6e 100644 --- a/.dotfiles/helpers/asdf-install.sh +++ b/.dotfiles/helpers/asdf-install.sh @@ -1,3 +1,5 @@ +#!/bin/bash +# asdf_install(){ . "$HOME/.asdf/asdf.sh" if [ "$(which asdf)" = "" ]; then diff --git a/.dotfiles/install/asdf.sh b/.dotfiles/install/asdf.sh index 877cf5a..952187d 100755 --- a/.dotfiles/install/asdf.sh +++ b/.dotfiles/install/asdf.sh @@ -1,5 +1,6 @@ if [ -d ~/.asdf ] ; then echo " ✓ asdf already installed" + source $HOME/.asdf/asdf.sh else git clone --quiet https://github.com/asdf-vm/asdf.git ~/.asdf > /dev/null cd ~/.asdf diff --git a/.dotfiles/setup.sh b/.dotfiles/setup.sh index 9e4a397..fcfd887 100755 --- a/.dotfiles/setup.sh +++ b/.dotfiles/setup.sh @@ -7,6 +7,7 @@ INTERACTIVE=false #Loading all the helper scripts +source $HOME/.dotfiles/helpers/asdf-install.sh source $HOME/.dotfiles/helpers/installer.sh source $HOME/.dotfiles/helpers/prompt.sh source $HOME/.dotfiles/helpers/multiselect.sh @@ -82,7 +83,7 @@ if [ "$INST_ASDF" = true ]; then # Requirements for ASDF install_package gnupg2 install_package unzip - $HOME/.dotfiles/install/asdf.sh + . $HOME/.dotfiles/install/asdf.sh if [ "$INST_NVIM" = true ]; then asdf_install neovim diff --git a/install.sh b/install.sh index 294ad97..c37186a 100755 --- a/install.sh +++ b/install.sh @@ -2,8 +2,8 @@ # - Prerequesits - if [ "$(which git)" = "" ]; then - echo "-- Installing git --" - apt-get install git -y >/dev/null + echo "Please install git before proceeding" + exit fi # - Cloning Repo -