fix make install

ansible/roles/hosts/files/.bash_profile

@@ -1,11 +1,12 @@
+# shellcheck shell=bash source=/dev/null
 # ~/.bash_profile: executed by the command interpreter for bash login shell.
 
-[ -f ~/.profile ] && source ~/.profile
+[ -f ~/.sh_profile ] && . ~/.sh_profile
 
 # bash-completion
 if ! shopt -oq posix && [ -z "${BASH_COMPLETION_VERSINFO-}" ]; then
-  if [ ${BASH_VERSINFO[0]} -gt 4 ] \
-   || [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+  if [ "${BASH_VERSINFO[0]}" -gt 4 ] \
+   || { [ "${BASH_VERSINFO[0]}" -eq 4 ] && [ "${BASH_VERSINFO[1]}" -ge 1 ] ;}; then
     shopt -q progcomp && for file in \
      /{*/local,usr}/share/bash-completion/bash_completion \
      /etc/bash_completion; do

ansible/roles/hosts/files/.dircolors_aliases

@@ -1,7 +0,0 @@
-test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-alias ls='ls --color=auto'
-alias dir='dir --color=auto'
-alias vdir='vdir --color=auto'
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'

ansible/roles/hosts/files/.docker_aliases

@@ -1 +0,0 @@
-alias ctop='docker run --rm -it -v /var/run/docker.sock:/var/run/docker.sock:ro quay.io/vektorlab/ctop:latest'

ansible/roles/hosts/files/.sh_profile

@@ -1,4 +1,5 @@
-# ~/.profile: executed by the command interpreter for login shells.
+# shellcheck shell=sh source=/dev/null
+# ~/.sh_profile: executed by the command interpreter for login shells.
 # set -x
 
 # source ~/.*aliases and ~/.*functions files
@@ -24,7 +25,7 @@ for file in "$HOME"/.*shrc; do
   # remove $HOME/. prefix from file
   file="${file#${HOME}/.}"
   # source file if match current shell
-  [ "$(basename ${SHELL})" = "${file%rc}" ] && . "${HOME}/.$file"
+  [ "$(basename "${SHELL}")" = "${file%rc}" ] && . "${HOME}/.$file"
 done
 
 # set PATH to include user's bin

ansible/roles/hosts/files/.vim_aliases

@@ -1 +0,0 @@
-alias vi='vim'

ansible/roles/hosts/files/etc/init.d/myos

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck source=/dev/null disable=SC2046
 ### BEGIN INIT INFO
 # Provides: myos
 # Required-Start: docker
@@ -8,16 +9,11 @@
 # Description: MYOS system calls
 ### END INIT INFO
 
-set -e
-
 # check system config
-[ -r /etc/default/myos ] && . /etc/default/myos || exit 1
-type make >/dev/null 2>&1 && [ -d "${MYOS}" ] || exit 2
-
-# load user config
-[ -r ~/.myos ] && . ~/.myos
+[ -r /etc/default/myos ] && . /etc/default/myos 2>/dev/null
+type make >/dev/null 2>&1 && [ -d "${MYOS}" ] || exit 1
 
 case "$1" in
   *)
-    IFS=$'\n'; exec sh -c "cd ${MYOS} && exec make $@ $(cat /etc/default/myos ~/.myos 2>/dev/null)"
+    IFS=$'\n'; cd "${MYOS}"; exec env $(cat /etc/default/myos ~/.myos 2>/dev/null) make "$@"
 esac

ansible/roles/hosts/files/etc/profile.d/rc_functions.sh

@@ -254,7 +254,8 @@ ssh_del() {
 tmux_attach() {
   command -v tmux >/dev/null 2>&1 || return
   TMUX_SESSION="$(id -nu)@$(hostname |sed 's/\..*//')"
-  if [ -z "${TMUX}" ]; then
+  # do not attach tmux in screen ;)
+  if [ -z "${TMUX}" -a -z "${STY}" ]; then
     printf 'Attaching tmux.' && sleep 1\
      && printf '.' && sleep 1\
      && printf '.' && sleep 1

ansible/roles/hosts/tasks/config.yml

@@ -1,19 +1,9 @@
 ---
 # file: tasks/config.yml
 
-- name: config - do not run docker-compose in docker - arch != x86
-  when: ansible_machine|lower != "x86_64"
-  with_items:
-  - DOCKER=false
-  lineinfile:
-    path: /etc/default/myos
-    create: yes
-    line: '{{ item }}'
-    mode: '0644'
-  become: yes
-
 - name: config - set MYOS config in /etc/default/myos
   with_items:
+  - APP_TYPE={{ lookup('env','ANSIBLE_APP_TYPE') }}
   - MYOS={{ lookup('env','ANSIBLE_MYOS') }}
   lineinfile:
     path: /etc/default/myos

ansible/roles/hosts/tasks/git.yml

@@ -5,7 +5,7 @@
   with_items: "{{ hosts_git_repositories|default([]) }}"
   git:
     repo: "{{ item.repo }}"
-    dest: "{{ item.dest|default('/dns') }}"
+    dest: "{{ item.dest }}"
     umask: "022"
     key_file: "{{ item.key_file|default('~/.ssh/id_rsa') }}"
     version: "{{ item.version|default('HEAD') }}"

ansible/roles/hosts/tasks/user.yml

@@ -34,21 +34,23 @@
 
 - name: user - copy ~/.*aliases ~/.*profile ~/.shrc
   with_items:
-    - ".dircolors_aliases"
-    - ".docker_aliases"
-    - ".vim_aliases"
     - ".bash_profile"
-    - ".profile"
+    - ".sh_profile"
     - ".shrc"
   copy: src=../files/{{item}} dest=~/{{item}} mode="0640" backup="yes"
 
 - name: user - update ~/.bashrc
   with_items:
   - PS1="╭∩╮$PS1"
-  - source .shrc
+  - source ~/.shrc
   - unset user_count process_count
   lineinfile: dest=~/.bashrc create=yes line='{{item}}'
 
+- name: user - update ~/.profile
+  with_items:
+  - source ~/.sh_profile
+  lineinfile: dest=~/.profile create=yes line='{{item}}'
+
 - name: user - update ~/.config/git/ignore
   with_items:
   - '.nfs*'