use apt instead of apt-get, looks nicer

This commit is contained in:
Frieder Schlesier 2017-03-07 18:05:01 +01:00
parent 095e3c71c8
commit b9871ea63e
1 changed files with 82 additions and 70 deletions

View File

@ -28,65 +28,70 @@ base_applications() {
echo "update and installing baseapps..." echo "update and installing baseapps..."
apt-get update apt update
apt-get upgrade apt upgrade
apt-get install -y \ DEBIAN_FRONTEND=noninteractive
apt-transport-https \
automake \ apt install -y \
bash-completion \ apt-transport-https \
bmon \ automake \
bzip2 \ bash-completion \
ca-certificates \ bmon \
cmake \ bzip2 \
coreutils \ ca-certificates \
curl \ cmake \
dnsutils \ coreutils \
gcc \ curl \
git \ dnsutils \
gnupg \ gcc \
gnupg2 \ git \
gnupg-agent \ gnupg \
gnupg-curl \ gnupg2 \
grep \ gnupg-agent \
htop \ gnupg-curl \
iotop \ grep \
locales \ htop \
make \ iotop \
mount \ locales \
net-tools \ make \
rsync \ mount \
ssh \ net-tools \
sudo \ rsync \
tar \ ssh \
tinc \ sudo \
tmux \ tar \
tree \ tinc \
vim \ tmux \
zip \ tree \
--no-install-recommends vim \
zip \
--no-install-recommends
echo "... DONE... cleaning up\n\n" echo "... DONE... cleaning up\n\n"
apt-get autoremove apt autoremove
apt-get autoclean apt autoclean
apt-get clean apt clean
} }
install_server_base() { install_server_base() {
echo "update and installing server base tools..." echo "update and installing server base tools..."
apt-get update
apt-get install -y \ DEBIAN_FRONTEND=noninteractive
fail2ban \
logwatch \ apt update
unattended-upgrades \ apt install -y \
--no-install-recommends fail2ban \
logwatch \
unattended-upgrades \
--no-install-recommends
echo "... DONE... cleaning up\n\n" echo "... DONE... cleaning up\n\n"
apt-get autoremove apt autoremove
apt-get autoclean apt autoclean
apt-get clean apt clean
echo "setting up logwatch..." echo "setting up logwatch..."
cat <<-EOF > /etc/cron.daily/00logwatch cat <<-EOF > /etc/cron.daily/00logwatch
@ -126,30 +131,33 @@ no_suspend() {
install_i3() { install_i3() {
echo "update and installing i3wm and some tools..." echo "update and installing i3wm and some tools..."
apt-get update
apt-get install -y \ DEBIAN_FRONTEND=noninteractive
alsa-utils \
clipit \ apt update
emacs25 \ apt install -y \
feh \ alsa-utils \
fswebcam \ clipit \
i3 \ emacs25 \
i3lock \ feh \
i3status \ fswebcam \
keepass2 \ i3 \
pulseaudio \ i3lock \
rxvt-unicode-256color \ i3status \
scrot \ keepass2 \
shotwell \ pulseaudio \
slim \ rxvt-unicode-256color \
xclip \ scrot \
xorg \ shotwell \
--no-install-recommends slim \
xclip \
xorg \
--no-install-recommends
echo "... DONE... cleaning up\n\n" echo "... DONE... cleaning up\n\n"
apt-get autoremove apt autoremove
apt-get autoclean apt autoclean
apt-get clean apt clean
no_suspend no_suspend
@ -326,6 +334,10 @@ main() {
base_applications base_applications
install_docker install_docker
install_compose
elif [[ $cmd == "docker" ]]; then
install_docker
elif [[ $cmd == "dotfiles" ]]; then elif [[ $cmd == "dotfiles" ]]; then
get_dotfiles get_dotfiles
elif [[ $cmd == "go" ]]; then elif [[ $cmd == "go" ]]; then