update.

[chise/chise-base.git] / bootstrap.homebrew

diff --git a/bootstrap.homebrew b/bootstrap.homebrew
index 36a698a..d99212f 100755 (executable)
--- a/bootstrap.homebrew
+++ b/bootstrap.homebrew
@@ -3,27 +3,36 @@
 brew update
 brew upgrade
 
+brew install https://raw.github.com/Homebrew/homebrew-dupes/master/gcc.rb \
+       --use-llvm
+export IMAKECPP=/usr/local/bin/cpp-4.7
+
 brew -v install libtiff
 brew -v install openjpeg
 brew -v install berkeley-db
 brew -v install xaw3d
 brew -v install gettext
 
+brew_prefix=`brew --prefix`
+
 if [ -f /Library/LaunchDaemons/homebrew.mxcl.canna.plist ]
 then
     sudo launchctl unload -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist
 fi
-if [ -x /usr/local/sbin/cannakill ]
+if [ -x ${brew_prefix}/sbin/cannakill ]
 then
-    sudo /usr/local/sbin/cannakill
+    sudo ${brew_prefix}/sbin/cannakill
 fi
 
-(cd `brew --prefix` ; git pull https://github.com/chise/homebrew/)
+(cd ${brew_prefix}; git pull https://github.com/chise/homebrew/)
 
 brew -v install canna
+brew upgrade
 
 sudo sh -c "sed 's/rc\.canna/rc.canna-root/' \
-    < /usr/local/Cellar/canna/3.7p3_1/homebrew.mxcl.canna.plist \
+    < ${brew_prefix}`ls -l ${brew_prefix}/sbin/cannaserver \
+                       | sed 's/^.*-> ..//' \
+                       | sed 's|/sbin/cannaserver||'`/homebrew.mxcl.canna.plist \
     > /Library/LaunchDaemons/homebrew.mxcl.canna.plist"
 sudo launchctl load -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist
 
@@ -40,5 +49,4 @@ make install-base
 
 cd chise-fonts-installer/TrueType && make build-arphic \
     && make install-arphic
-
-cd Hanazono/ && make install-mac
+make install-mac