From f65ec91dfb63e1669b0c94847b86cf1ce467ace0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gero=20M=C3=BCller?= <post@geromueller.de>
Date: Fri, 18 Mar 2016 22:02:45 +0100
Subject: [PATCH] fix colors

---
 jessie-server-common.sh | 70 ++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/jessie-server-common.sh b/jessie-server-common.sh
index 4ae1e95..db519fd 100644
--- a/jessie-server-common.sh
+++ b/jessie-server-common.sh
@@ -2,52 +2,56 @@
 
 set -e
 
-function main {
-    echo "Setup best practice default repositories, see http://httpredir.debian.org/"
-    tee /etc/apt/sources.list <<EOF
-    deb http://httpredir.debian.org/debian jessie main contrib
-    deb http://httpredir.debian.org/debian jessie-updates main contrib
-    deb http://httpredir.debian.org/debian jessie-backports main contrib
-    deb http://security.debian.org/ jessie/updates main
+{ # failed download protection
+
+
+echo "Setup best practice default repositories, see http://httpredir.debian.org/"
+tee /etc/apt/sources.list <<EOF
+deb http://httpredir.debian.org/debian jessie main contrib
+deb http://httpredir.debian.org/debian jessie-updates main contrib
+deb http://httpredir.debian.org/debian jessie-backports main contrib
+deb http://security.debian.org/ jessie/updates main
 EOF
-    apt update
+apt update
 
-    echo "Install important system tools."
-    apt install -y htop ne iotop curl wget zsh figlet iptraf
 
-    echo "Use zsh!"
-    wget -O /root/.zshrc http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
-    tee -a /root/.zshrc << EOF
+echo "Install important system tools."
+apt install -y htop ne iotop curl wget zsh figlet iptraf
+
+
+echo "Use zsh!"
+wget -O /root/.zshrc http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
+tee -a /root/.zshrc << EOF
 export LS_COLORS="*=00;37:rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:"
 RED="$(tput setaf 1)"
 ORANGE="$(tput setaf 3)"
 BLUE="$(tput setaf 4)"
 BLACK="$(tput sgr0)"
+colorls() {
+        /bin/ls -lh --color=yes $@ | sed -e "s/ \([0-9,.]\+K\) / ${BLUE}\1${BLACK} /g" -e "s/ \([0-9.,]\+G\) / ${RED}\1${BLACK} /g" -e "s/ \([0-9.,]\+M\) / ${ORANGE}\1${BLACK} /g"
+}
 alias ls='/bin/ls -h --color=auto'
-alias l='/bin/ls -lh --color=yes | sed -e "s/ \([0-9,.]\+K\) / ${BLUE}\1${BLACK} /g" -e "s/ \([0-9.,]\+G\) / ${RED}\1${BLACK} /g" -e "s/ \([0-9.,]\+M\) / ${ORANGE}\1${BLACK} /g"'
-alias ll='/bin/ls -Alh --color=yes | sed -e "s/ \([0-9,.]\+K\) / ${BLUE}\1${BLACK} /g" -e "s/ \([0-9.,]\+G\) / ${RED}\1${BLACK} /g" -e "s/ \([0-9.,]\+M\) / ${ORANGE}\1${BLACK} /g"'
+alias l='colorls'
+alias ll='colorls -A'
+
 EOF
-    chsh -s /bin/zsh
+chsh -s /bin/zsh
 
-    ( exec ne /etc/hostname /etc/hosts )
+echo "Setup hostname."
+( exec ne /etc/hostname /etc/hosts )
+hostname -F /etc/hostname
 
-    hostname -F /etc/hostname
+echo "Nice motd."
+figlet `hostname -f | sed 's/\./ \. /'` > /etc/motd
 
-    echo "Nice motd."
-    figlet `hostname -f | sed 's/\./ \. /'` > /etc/motd
+echo "Install system and security utils."
+apt install -y systemd-cron apticron ssmtp logwatch
+( exec ne /etc/ssmtp/* )
 
-    echo "Install system and security utils."
-    apt install -y systemd-cron apticron ssmtp logwatch
-    
-    ( exec ne /etc/ssmtp/* )
-    
-    echo "Disable unneeded getty"
-    for i in {4..6} do;
-        systemctl stop getty@tty$i.service
-        systemctl disable getty@tty$i.service
-    done
+echo "Disable unneeded getty"
+for i in {4..6}; do
+    systemctl stop getty@tty$i.service
+    systemctl disable getty@tty$i.service
+done
 
 }
-
-
-main