From eb0d0ebfc1dab0f3eaf75eec5ba8d9a163c888a8 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Wed, 24 Apr 2019 14:16:17 -0700 Subject: [PATCH 1/9] Only use dircolors when available. --- dotfiles/profile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotfiles/profile b/dotfiles/profile index 4062c24..56a3cf5 100755 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -9,6 +9,8 @@ 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") +whence dircolors >/dev/null 2>&1 && \ + test -f "${HOME}/.dircolors" && \ + eval $(dircolors "${HOME}/.dircolors") test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local" From 08952e7f22123512b61caddcd51dd4fb4eb3af03 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Fri, 26 Apr 2019 11:03:45 -0700 Subject: [PATCH 2/9] LSCOLORS on Darwin. --- dotfiles/profile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dotfiles/profile b/dotfiles/profile index 56a3cf5..7e91102 100755 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -1,3 +1,5 @@ +#!/bin/bash +# Also sourced by zsh, etc. # Interactive shells only. # Should only use POSIX constructs. @@ -9,8 +11,19 @@ export GREP_COLOR='01;31' export GREP_COLORS='mt=01;31:mc=01;31:ms=01;31' # Setup LS_COLORS -whence dircolors >/dev/null 2>&1 && \ +if whence dircolors >/dev/null 2>&1 ; then test -f "${HOME}/.dircolors" && \ - eval $(dircolors "${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 + if [ "$(uname)" == "Darwin" ] ; then + LSCOLORS="${LS_COLORS}" + export LSCOLORS + CLICOLOR=1 + export CLICOLOR + fi +fi test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local" From 1881916c8e6a639011253529e0841c36141f32a6 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Fri, 26 Apr 2019 11:07:07 -0700 Subject: [PATCH 3/9] Fix darwin LSCOLORS. --- dotfiles/profile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dotfiles/profile b/dotfiles/profile index 7e91102..3e5fa5b 100755 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -18,12 +18,12 @@ 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 - if [ "$(uname)" == "Darwin" ] ; then - LSCOLORS="${LS_COLORS}" - export LSCOLORS - CLICOLOR=1 - export CLICOLOR - fi +fi +if [ "$(uname)" == "Darwin" ] ; then + LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD" + export LSCOLORS + CLICOLOR=1 + export CLICOLOR fi test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local" From ac8fae69c6fa385861c30af1204f626299a20cba Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Fri, 26 Apr 2019 11:20:28 -0700 Subject: [PATCH 4/9] Add google public key. --- keys/gpg/dwt-google.pub | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 keys/gpg/dwt-google.pub diff --git a/keys/gpg/dwt-google.pub b/keys/gpg/dwt-google.pub new file mode 100644 index 0000000..e0d3ad6 --- /dev/null +++ b/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----- From d2849bfe9e3cc727e33c3b5586d66be5b14c566f Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 27 Apr 2019 13:16:44 -0700 Subject: [PATCH 5/9] Fix comparison operator. --- dotfiles/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/profile b/dotfiles/profile index 3e5fa5b..522556b 100755 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -19,7 +19,7 @@ else 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 +if [ "$(uname)" = "Darwin" ] ; then LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD" export LSCOLORS CLICOLOR=1 From 17c2767de5d4ee154034b98482c022f1d7838283 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 29 Apr 2019 12:58:44 -0700 Subject: [PATCH 6/9] Add syntastic for vim. --- .gitmodules | 3 +++ dotfiles/vim/pack/matir/start/syntastic | 1 + 2 files changed, 4 insertions(+) create mode 160000 dotfiles/vim/pack/matir/start/syntastic diff --git a/.gitmodules b/.gitmodules index 0a479c5..a58d471 100644 --- a/.gitmodules +++ b/.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 diff --git a/dotfiles/vim/pack/matir/start/syntastic b/dotfiles/vim/pack/matir/start/syntastic new file mode 160000 index 0000000..9f43dcb --- /dev/null +++ b/dotfiles/vim/pack/matir/start/syntastic @@ -0,0 +1 @@ +Subproject commit 9f43dcb5a244faba6aedb6879b75a56c7de4b8ff From 05c2ef7848e26520cac3f0792820ff68e7e1ed99 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 29 Apr 2019 13:09:39 -0700 Subject: [PATCH 7/9] Fix double equals in posix shell comparison. --- dotfiles/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/profile b/dotfiles/profile index 3e5fa5b..522556b 100755 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -19,7 +19,7 @@ else 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 +if [ "$(uname)" = "Darwin" ] ; then LSCOLORS="gxfxbEaEBxxEhEhBaDaCaD" export LSCOLORS CLICOLOR=1 From 19d78117cbfddec4cb1cc38783368f890b68816b Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 29 Apr 2019 15:59:58 -0700 Subject: [PATCH 8/9] Symlink submodules as a whole instead of each file. Fixes #6. --- install.sh | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 461cf12..726eb3e 100755 --- a/install.sh +++ b/install.sh @@ -48,17 +48,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() { From 03a12e509ece47d2fbfb1a68f9d4c9df1ca92861 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 29 Apr 2019 16:33:17 -0700 Subject: [PATCH 9/9] Add a bash/zsh compatibility option. --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index 726eb3e..f8dd337 100755 --- a/install.sh +++ b/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)