From bb92b6e39d3060085112b9b28635352076f959fa Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 11 Mar 2014 00:20:03 +0900 Subject: [PATCH 1/4] minttyrc: update --- win/minttyrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win/minttyrc b/win/minttyrc index 2393c68..27cb7e6 100644 --- a/win/minttyrc +++ b/win/minttyrc @@ -1,8 +1,8 @@ BoldAsFont=no -Transparency=low +Transparency=medium CursorType=block Font=Source Code Pro Light -FontHeight=10 +FontHeight=11 Locale=ja_JP Charset=UTF-8 CopyOnSelect=no @@ -10,3 +10,4 @@ CopyAsRTF=no Scrollbar=none Term=xterm-256color Blue=0,128,255 +OpaqueWhenFocused=no From 9b828eba5289d625e39fcf2c6ee692f1511393b5 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 11 Mar 2014 19:09:27 +0900 Subject: [PATCH 2/4] setup.sh: add setup windirs --- setup.sh | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/setup.sh b/setup.sh index ae4ca9d..1e2b069 100755 --- a/setup.sh +++ b/setup.sh @@ -1,8 +1,9 @@ #!/bin/sh +set -e # setup.sh --- 10sr setup script -__setups="gitconf tmux scripts darwin dirs selfupdate" +__setups="gitconf tmux scripts darwin dirs selfupdate windirs" __homelocal="$HOME/.local" __homevar="$HOME/.var" @@ -46,7 +47,7 @@ gen_common(){ __islinux=false # $OSTYPE is another choice. which is better? - # sh on FreeBSD does not define OSTYPE + # NOTE: sh on FreeBSD does not define OSTYPE case `uname` in (MINGW*) __ismsys=true ;; (CYGWIN*) __iscygwin=true ;; @@ -101,7 +102,7 @@ setup_gitconf(){ if ! command -v git >/dev/null then echo "git not found" - return 1 + return 0 fi _gc="git config --global" @@ -207,7 +208,7 @@ _fetch_script(){ url="$1" name="$2" dst="$HOME/.local/bin/$name" - command -v "$name" >/dev/null && return + command -v "$name" >/dev/null && return 0 if _download "$url" "$dst" then chmod u+x "$dst" @@ -227,7 +228,7 @@ setup_scripts(){ # darwin __darwin_set_defaults(){ - $isdarwin || return 1 + $isdarwin || return 0 # http://appdrill.net/60641/mac-boot-mute.html #sudo nvram SystemAudioVolume=%80 @@ -246,7 +247,7 @@ __darwin_set_defaults(){ } __darwin_start_daemon(){ - $isdarwin || return 1 + $isdarwin || return 0 test "`launchctl getenv LC_ALL`" = C || sudo launchctl setenv LC_ALL C if ! (launchctl list | grep com.apple.locate) >/dev/null @@ -260,6 +261,24 @@ setup_darwin(){ __darwin_start_daemon } +########################## +# setup windows directories + +setup_windirs(){ + $iswindows || return 0 + + if $iscygwin + then + # this may invalid on systems other than windows7 + __winhome="/cygdrive/c/Users/`whoami`" + fi + + if test -n "$__winhome" -a -d "$__winhome" -a '!' -e "$HOME/.winhome" + then + ln -s "$__winhome" "$HOME/.winhome" + fi +} + ######################### # mkdirs From 05e68aee02281e876ba6e709dd69b3d06c619e70 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 11 Mar 2014 21:23:42 +0900 Subject: [PATCH 3/4] setup.sh: detect homeroot with cygpath --- setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.sh b/setup.sh index 1e2b069..b888586 100755 --- a/setup.sh +++ b/setup.sh @@ -269,8 +269,8 @@ setup_windirs(){ if $iscygwin then - # this may invalid on systems other than windows7 - __winhome="/cygdrive/c/Users/`whoami`" + #__winhome="/cygdrive/c/Users/`whoami`" + __winhome=`cygpath -H`/`whoami` fi if test -n "$__winhome" -a -d "$__winhome" -a '!' -e "$HOME/.winhome" From 17625275f2a9000bebb0060c78760ed54a38f836 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 12 Mar 2014 12:40:14 +0900 Subject: [PATCH 4/4] minttyrc: use dejavu font --- win/minttyrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win/minttyrc b/win/minttyrc index 27cb7e6..87f83e7 100644 --- a/win/minttyrc +++ b/win/minttyrc @@ -1,8 +1,9 @@ BoldAsFont=no Transparency=medium CursorType=block -Font=Source Code Pro Light -FontHeight=11 +#Font=Source Code Pro Light +Font=DejaVu Sans Mono +FontHeight=10 Locale=ja_JP Charset=UTF-8 CopyOnSelect=no