Merge branch 'master' of github.com:Matir/skel

.gitmodules

@@ -30,3 +30,6 @@
 	path = dotfiles/tmux/tmux-logging
 	url = https://github.com/tmux-plugins/tmux-logging.git
 	fetchRecurseSubmodules = true
+[submodule "dotfiles/vim/pack/matir/start/syntastic"]
+	path = dotfiles/vim/pack/matir/start/syntastic
+	url = https://github.com/vim-syntastic/syntastic.git

dotfiles/profile

@@ -1,3 +1,5 @@
+#!/bin/bash
+# Also sourced by zsh, etc.
 # Interactive shells only.
 # Should only use POSIX constructs.
 
@@ -9,6 +11,19 @@ export GREP_COLOR='01;31'
 export GREP_COLORS='mt=01;31:mc=01;31:ms=01;31'
 
 # Setup LS_COLORS
-test -f "${HOME}/.dircolors" && eval $(dircolors "${HOME}/.dircolors")
+if whence dircolors >/dev/null 2>&1 ; then
+  test -f "${HOME}/.dircolors" && \
+  eval "$(dircolors "${HOME}/.dircolors")"
+else
+# Static solarized LS_COLORS
+  LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.hpp=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.cl=32:*.sh=32:*.bash=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.go=32:*.sql=32:*.csv=32:*.sv=32:*.svh=32:*.v=32:*.vh=32:*.vhd=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.PNG=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.m4a=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.opus=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.MOV=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.webm=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.odt=31:*.dot=31:*.dotx=31:*.ott=31:*.xls=31:*.xlsx=31:*.ods=31:*.ots=31:*.ppt=31:*.pptx=31:*.odp=31:*.otp=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:*.sqlite=34:';
+  export LS_COLORS
+fi
+if [ "$(uname)" = "Darwin" ] ; then
+  LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD"
+  export LSCOLORS
+  CLICOLOR=1
+  export CLICOLOR
+fi
 
 test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local"

install.sh

@@ -2,6 +2,7 @@
 
 set -o nounset
 set -o errexit
+set -o shwordsplit 2>/dev/null  # Make zsh behave like bash
 
 case $(uname) in
   Linux)
@@ -48,17 +49,39 @@ prerequisites() {
 install_dotfile_dir() {
   local SRCDIR="${1}"
   local dotfile
+  local submodule_prune="$(git submodule status -- "${SRCDIR}" 2>/dev/null | \
+    awk '{print $2}' | \
+    while read submod ; do
+      echo -n " -o -path ${BASEDIR}/${submod}"
+    done)"
   find "${SRCDIR}" \( -name .git -o \
                     -path "${SRCDIR}/private_dotfiles" -o \
                     -name install.sh -o \
                     -name README.md -o \
-                    -name .gitignore \) \
+                    -name .gitignore \
+                    ${submodule_prune} \) \
       -prune -o ${FINDTYPE} f -print | \
     while read dotfile ; do
       local TARGET="${HOME}/.${dotfile#${SRCDIR}/}"
-      mkdir -p `dirname "${TARGET}"`
+      mkdir -p $(dirname "${TARGET}")
       ln -s -f "${dotfile}" "${TARGET}"
     done
+  git submodule status -- "${SRCDIR}" 2>/dev/null | \
+    awk '{print $2}' | \
+    while read submodule ; do
+      local FULLNAME="${BASEDIR}/${submodule}"
+      local TARGET="${HOME}/.${FULLNAME#${SRCDIR}/}"
+      mkdir -p $(dirname "${TARGET}")
+      if test -L "${TARGET}" ; then
+        if [ "$(readlink "${TARGET}")" != "${FULLNAME}" ] ; then
+          echo "${TARGET} points to $(readlink "${TARGET}") not ${FULLNAME}!" >/dev/stderr
+        fi
+      elif test -d "${TARGET}" ; then
+        echo "rm -rf ${TARGET}" >/dev/stderr
+      else
+        ln -s -f "${FULLNAME}" "${TARGET}"
+      fi
+    done
 }
 
 install_basic_dir() {

keys/gpg/dwt-google.pub

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+ZognKA5LFIgbx3K/arjml2poMg==
+=amL+
+-----END PGP PUBLIC KEY BLOCK-----