fix colors

jessie-server-common.sh

@@ -2,7 +2,9 @@
 
 set -e
 
-function 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
@@ -12,9 +14,11 @@ function main {
 EOF
 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
@@ -23,14 +27,18 @@ 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
 
+echo "Setup hostname."
 ( exec ne /etc/hostname /etc/hosts )
-
 hostname -F /etc/hostname
 
 echo "Nice motd."
@@ -38,16 +46,12 @@ EOF
 
 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;
+for i in {4..6}; do
     systemctl stop getty@tty$i.service
     systemctl disable getty@tty$i.service
 done
 
 }
-
-
-main