diff --git a/.installers/install_bash.sh b/.installers/install_bash.sh index 11f6a1a..9bbe052 100644 --- a/.installers/install_bash.sh +++ b/.installers/install_bash.sh @@ -1,12 +1,8 @@ echo "Hello $USER!" echo "Give me a second please..." -mv ../dist/aliases.sh .aliases -mv ../dist/profile.sh .profile - mkdir ~/.shells/ - -cp dist/.* ~/.shells/ +cp -rf ../dist/.* ~/.shells/ # BASH cat dist/rcfile.sh >> ~/.bashrc diff --git a/.installers/install_zsh.sh b/.installers/install_zsh.sh index 855284f..2f3c50e 100755 --- a/.installers/install_zsh.sh +++ b/.installers/install_zsh.sh @@ -1,9 +1,10 @@ echo "Hello $USER!" echo "Give me a second please..." -cp -rf ../zsh/dotfiles ~/.oh-my-zsh/custom/plugins +mkdir ~/.shells/ +cp -rf ../dist/.* ~/.shells/ -# ZSH or OH-MY-ZSH +# ZSH cat ../dist/rcfile.sh >> ~/.zshrc echo "Done! Please visit https://www.github.com/Rawnly for more infos." diff --git a/dist/rcfile.sh b/dist/rcfile.sh index 32f3c5d..6738a4c 100755 --- a/dist/rcfile.sh +++ b/dist/rcfile.sh @@ -6,8 +6,8 @@ export FULLNAME="$NAME $SURNAME" export NICKNAME="edit this in ~/.zshrc" # Source files -source ~/.shells/.aliases # or . path/to/file -source ~/.shells/.profile # or . path/to/file +source ~/.shells/aliases.sh +source ~/.shells/profile.sh # Invoke welcome message function in profile.sh welcome diff --git a/install.sh b/install.sh index 2b43e83..dccfffc 100755 --- a/install.sh +++ b/install.sh @@ -6,9 +6,9 @@ sudo npm install -g weather-commandline if [[ $SHELL == '/bin/zsh' ]] then echo "Your are using $SHELL" - source .installers/install_zsh.sh + ./.installers/install_zsh.sh elif [[ $SHELL == '/bin/sh' ]] then echo "Your are using $SHELL" - source .installers/install_bash.sh + ./.installers/install_bash.sh fi