From 441f37d46556dd06470061d50e37c932b496401d Mon Sep 17 00:00:00 2001
From: Frieder Schlesier <fschl.code@gmail.com>
Date: Fri, 1 Jul 2016 01:37:22 +0200
Subject: [PATCH] updates

---
 .aliases    |  1 +
 .dockerfunc | 13 +++++++++----
 install.sh  | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/.aliases b/.aliases
index 4f15de7..56087f4 100755
--- a/.aliases
+++ b/.aliases
@@ -6,6 +6,7 @@ alias .....='cd ../../../..'
 alias ll='ls -ahlF'
 alias la='ls -Ah'
 alias l='ls -CF'
+alias feh='feh -d --scale-down'
 
 alias dps='docker ps -a'
 alias di='docker images'
diff --git a/.dockerfunc b/.dockerfunc
index eb1bed0..33ddcfa 100755
--- a/.dockerfunc
+++ b/.dockerfunc
@@ -205,10 +205,14 @@ libreoffice() {
            -e GDK_DPI_SCALE \
            --name libreoffice \
            fschl/libreoffice
+
+    exit 0;
 }
 
 netbeans() {
+
     docker run -it \
+           --name netbeans \
            -e DISPLAY=$DISPLAY \
            -v /tmp/.X11-unix:/tmp/.X11-unix \
            -v $HOME/.netbeans-docker:/home/developer/.netbeans \
@@ -262,8 +266,6 @@ pulseaudio() {
 rstudio(){
     del_stopped rstudio
 
-    #		-e QT_DEVICE_PIXEL_RATIO \
-
     docker run -d \
            -v /etc/localtime:/etc/localtime:ro \
            -v /tmp/.X11-unix:/tmp/.X11-unix \
@@ -274,6 +276,8 @@ rstudio(){
            --device /dev/dri \
            --name rstudio \
            rocker/rstudio
+
+    exit 0;
 }
 
 scenebuilder() {
@@ -306,6 +310,8 @@ skype() {
            --name skype \
            --net host \
            fschl/skype
+
+    exit 0;
 }
 
 torbrowser() {
@@ -321,8 +327,7 @@ torbrowser() {
            --name torbrowser \
            fschl/tor-browser
 
-    # exit current shell
-    exit 0
+    exit 0;
 }
 
 
diff --git a/install.sh b/install.sh
index 7c271b7..d95324a 100755
--- a/install.sh
+++ b/install.sh
@@ -18,13 +18,16 @@ deb-src http://security.debian.org/ stable/updates main contrib non-free
 deb http://ftp.de.debian.org/debian/ stable-updates main contrib non-free
 deb-src http://ftp.de.debian.org/debian/ stable-updates main contrib non-free
 
-deb http://ftp.fr.debian.org/debian/ stable-proposed-updates main
-deb http://ftp.fr.debian.org/debian/ testing main
+deb http://ftp.de.debian.org/debian/ stable-proposed-updates main
+deb http://ftp.de.debian.org/debian/ testing main
 EOF
 
 }
 
 base_applications() {
+
+    echo "update and installing baseapps..."
+
     apt-get update
     apt-get upgrade
 
@@ -60,6 +63,7 @@ base_applications() {
 
     install_i3
 
+    echo "... DONE... cleaning up\n\n"
     apt-get autoremove
     apt-get autoclean
     apt-get clean
@@ -67,6 +71,8 @@ base_applications() {
 }
 
 install_i3() {
+
+    echo "update and installing i3wm..."
     apt-get update
     apt-get install -y \
             feh \
@@ -78,16 +84,34 @@ install_i3() {
             slim \
             xorg \
             --no-install-recommends
+
+    echo "... DONE... cleaning up\n\n"
+    apt-get autoremove
+    apt-get autoclean
+    apt-get clean
 }
 
 install_docker() {
+
+    echo "installing docker from get.docker.com | sh..."
     adduser -aG docker "$USERNAME"
 
     curl -sSL https://get.docker.com/ | sh
 
-    curl -SL https://github.com/docker/compose/releases/download/1.5.2/docker-compose-Linux-x86_64 \
+}
+
+install_compose() {
+
+    VERS="1.7.1"
+    echo "installing docker-compose $VERS ... curling from github"
+
+    curl -SL https://github.com/docker/compose/releases/download/$VERS/docker-compose-Linux-x86_64 \
          -o /usr/bin/docker-compose
     chmod +x /usr/bin/docker-compose
+
+    echo "... done"
+
+    /usr/bin/docker-compose version
 }
 
 get_dotfiles() {
@@ -103,13 +127,24 @@ get_dotfiles() {
 }
 
 main() {
-    apt_sources
+    local cmd=$1
 
-    base_applications
+    if [[ -z "$cmd" ]]; then
+        apt_sources
 
-    install_docker
+        base_applications
+
+        install_docker
+
+        install_i3
+    fi
+
+    if [[ $cmd == "compose" ]]; then
+        install_compose
+    elif [[ $cmd == "dotfiles" ]]; then
+        get_dotfiles
+    fi
 
-    install_i3
 }
 
 main "$@"