From c42d5d9a1f84c74f1bc6e2be9bae0284089a2dba Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Fri, 3 Aug 2012 16:14:48 +0900
Subject: [PATCH] mv _my_git_config to setup.sh

---
 bashrc   | 27 ---------------------------
 setup.sh | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 28 deletions(-)
 mode change 100644 => 100755 setup.sh

diff --git a/bashrc b/bashrc
index 080337a..3c08a31 100755
--- a/bashrc
+++ b/bashrc
@@ -334,33 +334,6 @@ convmv-sjis2utf8-notest(){
     convmv -r -f sjis -t utf8 * --notest
 }
 
-_my_git_config(){
-    git config --global user.name '10sr'
-    git config --global user.email '8slashes+git@gmail.com'
-    git config --global core.autocrlf false
-    git config --global core.excludesfile '~/.gitignore'
-    git config --global color.ui auto
-    git config --global status.relativePaths false
-    git config --global status.showUntrackedFiles normal
-    git config --global log.date iso
-    git config --global alias.graph "log --graph --date-order -C -M --pretty=tformat:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=iso"
-    git config --global alias.st "status -s -b"
-    git config --global alias.b "branch"
-    git config --global alias.ci "commit --verbose"
-    git config --global alias.co "checkout"
-    git config --global alias.cim "commit --verbose -m"
-    git config --global alias.di "diff --color"
-    git config --global alias.me "merge --no-ff --stat -v"
-    git config --global alias.ls "ls-files -v --full-name"
-    git config --global alias.sl "!sl"
-    # git config --global alias.my-ls "ls-files | xargs ls"
-    # git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
-    git config --global alias.addi "add -i"
-    if iswindows; then
-        git config --global core.fileMode false
-    fi
-}
-
 __my_parse_svn_branch() {
     local LANG=C
     local svn_url=$(svn info 2>/dev/null | sed -ne 's#^URL: ##p')
diff --git a/setup.sh b/setup.sh
old mode 100644
new mode 100755
index 26d1788..8b0bc2c
--- a/setup.sh
+++ b/setup.sh
@@ -22,7 +22,6 @@ _my_install_script(){
         }
     done
 }
-_my_install_script http://www.frexx.de/xterm-256-notes/data/colortable16.sh http://www.frexx.de/xterm-256-notes/data/256colors2.pl
 
 _my_install_symlink_script(){
     mkdir -p "$HOME/.local/bin/"
@@ -31,3 +30,34 @@ _my_install_symlink_script(){
         ln -s "$PWD/$f" "$HOME/.local/bin/"
     done
 }
+
+_my_git_config(){
+    git config --global user.name '10sr'
+    git config --global user.email '8slashes+git@gmail.com'
+    git config --global core.autocrlf false
+    git config --global core.excludesfile '~/.gitignore'
+    git config --global color.ui auto
+    git config --global status.relativePaths false
+    git config --global status.showUntrackedFiles normal
+    git config --global log.date iso
+    git config --global alias.graph "log --graph --date-order -C -M --pretty=tformat:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=iso"
+    git config --global alias.st "status -s -b"
+    git config --global alias.b "branch"
+    git config --global alias.ci "commit --verbose"
+    git config --global alias.co "checkout"
+    git config --global alias.cim "commit --verbose -m"
+    git config --global alias.di "diff --color"
+    git config --global alias.me "merge --no-ff --stat -v"
+    git config --global alias.ls "ls-files -v --full-name"
+    git config --global alias.sl "!sl"
+    # git config --global alias.my-ls "ls-files | xargs ls"
+    # git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
+    git config --global alias.addi "add -i"
+    if iswindows; then
+        git config --global core.fileMode false
+    fi
+}
+
+_my_install_script http://www.frexx.de/xterm-256-notes/data/colortable16.sh http://www.frexx.de/xterm-256-notes/data/256colors2.pl
+
+type git >/dev/null 2>&1 && _my_git_config