Browse Source

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 10 years ago
parent
commit
40c75b697f
2 changed files with 29 additions and 8 deletions
  1. +25
    -6
      setup.sh
  2. +4
    -2
      win/minttyrc

+ 25
- 6
setup.sh View File

@@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
set -e


# setup.sh --- 10sr setup script # setup.sh --- 10sr setup script


__setups="gitconf tmux scripts darwin dirs selfupdate"
__setups="gitconf tmux scripts darwin dirs selfupdate windirs"


__homelocal="$HOME/.local" __homelocal="$HOME/.local"
__homevar="$HOME/.var" __homevar="$HOME/.var"
@@ -46,7 +47,7 @@ gen_common(){
__islinux=false __islinux=false


# $OSTYPE is another choice. which is better? # $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 case `uname` in
(MINGW*) __ismsys=true ;; (MINGW*) __ismsys=true ;;
(CYGWIN*) __iscygwin=true ;; (CYGWIN*) __iscygwin=true ;;
@@ -101,7 +102,7 @@ setup_gitconf(){
if ! command -v git >/dev/null if ! command -v git >/dev/null
then then
echo "git not found" echo "git not found"
return 1
return 0
fi fi


_gc="git config --global" _gc="git config --global"
@@ -207,7 +208,7 @@ _fetch_script(){
url="$1" url="$1"
name="$2" name="$2"
dst="$HOME/.local/bin/$name" dst="$HOME/.local/bin/$name"
command -v "$name" >/dev/null && return
command -v "$name" >/dev/null && return 0
if _download "$url" "$dst" if _download "$url" "$dst"
then then
chmod u+x "$dst" chmod u+x "$dst"
@@ -227,7 +228,7 @@ setup_scripts(){
# darwin # darwin


__darwin_set_defaults(){ __darwin_set_defaults(){
$isdarwin || return 1
$isdarwin || return 0


# http://appdrill.net/60641/mac-boot-mute.html # http://appdrill.net/60641/mac-boot-mute.html
#sudo nvram SystemAudioVolume=%80 #sudo nvram SystemAudioVolume=%80
@@ -246,7 +247,7 @@ __darwin_set_defaults(){
} }


__darwin_start_daemon(){ __darwin_start_daemon(){
$isdarwin || return 1
$isdarwin || return 0


test "`launchctl getenv LC_ALL`" = C || sudo launchctl setenv LC_ALL C test "`launchctl getenv LC_ALL`" = C || sudo launchctl setenv LC_ALL C
if ! (launchctl list | grep com.apple.locate) >/dev/null if ! (launchctl list | grep com.apple.locate) >/dev/null
@@ -260,6 +261,24 @@ setup_darwin(){
__darwin_start_daemon __darwin_start_daemon
} }


##########################
# setup windows directories

setup_windirs(){
$iswindows || return 0

if $iscygwin
then
#__winhome="/cygdrive/c/Users/`whoami`"
__winhome=`cygpath -H`/`whoami`
fi

if test -n "$__winhome" -a -d "$__winhome" -a '!' -e "$HOME/.winhome"
then
ln -s "$__winhome" "$HOME/.winhome"
fi
}

######################### #########################
# mkdirs # mkdirs




+ 4
- 2
win/minttyrc View File

@@ -1,7 +1,8 @@
BoldAsFont=no BoldAsFont=no
Transparency=low
Transparency=medium
CursorType=block CursorType=block
Font=Source Code Pro Light
#Font=Source Code Pro Light
Font=DejaVu Sans Mono
FontHeight=10 FontHeight=10
Locale=ja_JP Locale=ja_JP
Charset=UTF-8 Charset=UTF-8
@@ -10,3 +11,4 @@ CopyAsRTF=no
Scrollbar=none Scrollbar=none
Term=xterm-256color Term=xterm-256color
Blue=0,128,255 Blue=0,128,255
OpaqueWhenFocused=no

Loading…
Cancel
Save