diff --git a/install.sh b/install.sh index aae1348..87dacaf 100755 --- a/install.sh +++ b/install.sh @@ -33,7 +33,7 @@ for script in $script_filter; do # Log execution script_name="$(basename "$script" ".sh")" - printf "Running ${C_YELLOW}$script_name${C_NC}...\n${C_DGRAY}" + printf "\nRunning ${C_YELLOW}$script_name${C_NC}...\n${C_DGRAY}" # Run and indent output source "$script" | indent @@ -43,7 +43,7 @@ for script in $script_filter; do done || make clean # Clean up and exit -printf "Done! Cleaning up...\n${C_DGRAY}" +printf "\nDone! Cleaning up...\n${C_DGRAY}" make clean printf "${C_NC}\n" exit 0 diff --git a/install/00-apt-pkglist b/install/00-apt-pkglist index eb1d14d..4226899 100644 --- a/install/00-apt-pkglist +++ b/install/00-apt-pkglist @@ -2,3 +2,4 @@ curl make net-tools openssh-server +screenfetch diff --git a/install/10-git.sh b/install/10-git.sh index 7f01fce..117a067 100644 --- a/install/10-git.sh +++ b/install/10-git.sh @@ -9,3 +9,4 @@ readonly git_source="$dotfiles_dir/git" readonly git_target="$HOME" link_folder "$git_source" "$git_target" printf "git dotfiles linked\n" +git --version diff --git a/install/11-keybase.sh b/install/11-keybase.sh index 2df5b51..85431ee 100644 --- a/install/11-keybase.sh +++ b/install/11-keybase.sh @@ -15,5 +15,4 @@ if not_installed "keybase"; then fi printf "keybase is installed\n" -run_keybase keybase --version diff --git a/install/20-pyenv.sh b/install/20-pyenv.sh index c37bcec..b946eba 100644 --- a/install/20-pyenv.sh +++ b/install/20-pyenv.sh @@ -20,7 +20,10 @@ if not_installed "pyenv"; then run https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer bash # Add to install path - export PATH="$HOME/.pyenv/bin:$PATH" + readonly pyenv_path="$HOME/.pyenv/bin" + export PATH="$pyenv_path:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" fi printf "pyenv is installed\n" diff --git a/install/21-python.sh b/install/21-python.sh index f6fc84b..f86b0c9 100644 --- a/install/21-python.sh +++ b/install/21-python.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash # # After running this script: -# 1. python is installed +# 1. python3 is installed # # 1. python is installed -if not_installed "python"; then +if not_installed "python3"; then - printf "Installing python...\n" + printf "Installing python3...\n" pyenv install -s 3.7.0 pyenv global 3.7.0 fi -printf "python is installed\n" +printf "python3 is installed\n" diff --git a/install/999-screenfetch.sh b/install/999-screenfetch.sh new file mode 100644 index 0000000..7563217 --- /dev/null +++ b/install/999-screenfetch.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +screenfetch diff --git a/utils.sh b/utils.sh index 1ed0bc5..d90a91b 100644 --- a/utils.sh +++ b/utils.sh @@ -4,20 +4,20 @@ # update() { - sudo apt-get update -y + sudo apt-get update -qqy } # Non-interactive upgrade upgrade() { DEBIAN_FRONTEND=noninteractive \ - sudo apt-get upgrade -y \ + sudo apt-get upgrade -qqy \ -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" } # @arg $1 packages to install install() { - sudo apt-get install -y $1 + sudo apt-get install -qqy $1 } # @arg $1 repository to add