tidy output

This commit is contained in:
Andrejus
2020-02-26 17:11:28 +00:00
parent 4199ec7c35
commit c0214e73ad
8 changed files with 17 additions and 11 deletions

View File

@@ -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

View File

@@ -2,3 +2,4 @@ curl
make
net-tools
openssh-server
screenfetch

View File

@@ -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

View File

@@ -15,5 +15,4 @@ if not_installed "keybase"; then
fi
printf "keybase is installed\n"
run_keybase
keybase --version

View File

@@ -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"

View File

@@ -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"

View File

@@ -0,0 +1,2 @@
#!/usr/bin/env bash
screenfetch

View File

@@ -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