diff --git a/.zshrc-mac b/.zshrc-mac index 59d9f31..a70f5d9 100644 --- a/.zshrc-mac +++ b/.zshrc-mac @@ -114,6 +114,7 @@ fi #autoload -Uz compinit #compinit source $HOME/.zshrc-theme +source $HOME/py_ansible/bin/activate HISTSIZE=1000 HISTFILESIZE=2000 export EDITOR=vim diff --git a/install.sh b/install.sh index 815a251..6dd4675 100755 --- a/install.sh +++ b/install.sh @@ -1,10 +1,10 @@ #!/bin/bash ## Author: crunchie ## Description: Script to automatically link up certain files in home-directory to pre-built versions. -## Backups of currently installed versions are made in a .dtbak-file. -## Links the .zshrc, .zshrc-theme and .aliases file to different files depending on whether a linux or mac platform is in use. -## install routine checks whether .oh-my-zsh exists in users home-folder - and install .oh-my-zsh unattended if not. -## if .oh-my-zsh is installed the version will be updated to the current version. +## Backups of currently installed versions are made in a .dtbak-file. +## Links the .zshrc, .zshrc-theme and .aliases file to different files depending on whether a linux or mac platform is in use. +## install routine checks whether .oh-my-zsh exists in users home-folder - and install .oh-my-zsh unattended if not. +## if .oh-my-zsh is installed the version will be updated to the current version. # function to check if mac or linux check_os () { @@ -40,7 +40,7 @@ check_exist () { fi } -# function to check whether .oh-my-zsh is installed. +# function to check whether .oh-my-zsh is installed. # installation is checked by looking if ~/.oh-my-zsh exists. check_oh-my-zsh () { if [ -d ~/.oh-my-zsh ]; then @@ -60,7 +60,7 @@ check_oh-my-zsh inst=$? if [ $inst == 3 ]; then sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended -else +else git -C ~/.oh-my-zsh/ pull fi @@ -83,7 +83,7 @@ do if [ $? == 2 ]; then unlink_mv_file ~/$file fi -done +done # link the .zshrc-file in home-directory depending on the underlying os if [ $os == linux ];then