From 5e37e5a37d289d65889f6aaa70967196bce70e31 Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Thu, 17 Sep 2015 18:52:10 +0800
Subject: [PATCH] add adminUsername on app.conf

---
 bin/release.sh | 14 +++++++++-----
 bin/run.bat    |  2 +-
 bin/run.sh     |  2 +-
 conf/app.conf  |  3 +++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bin/release.sh b/bin/release.sh
index d27c348..3e488d2 100644
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -9,7 +9,7 @@ SP=$(cd "$(dirname "$0")"; pwd)
 tmp="/Users/life/Desktop/leanote_release"
 
 # version
-V="v1.0"
+V="v1.0.1"
 
 ##=================================
 # 1. 先build 成 3个平台, 2种bit = 6种
@@ -37,11 +37,13 @@ function build()
 
 build "linux" "386";
 build "linux" "amd64";
-build "darwin" "386";
-build "darwin" "amd64";
+
 build "windows" "386";
 build "windows" "amd64";
 
+build "darwin" "386";
+build "darwin" "amd64";
+
 
 ##======================
 # 2. release目录准备工作
@@ -133,9 +135,11 @@ function tarRelease()
 
 tarRelease "linux" "386";
 tarRelease "linux" "amd64";
-tarRelease "darwin" "386";
-tarRelease "darwin" "amd64";
+
 tarRelease "windows" "386";
 tarRelease "windows" "amd64";
 
+tarRelease "darwin" "386";
+tarRelease "darwin" "amd64";
+
 # BLOCK'
diff --git a/bin/run.bat b/bin/run.bat
index e422721..cdb3831 100644
--- a/bin/run.bat
+++ b/bin/run.bat
@@ -13,7 +13,7 @@ if exist "%path%\leanote" del /Q "%path%\leanote"
 mklink /D "%path%\leanote"  %SCRIPTPATH%
 
 : set GOPATH
-set GOPATH=%GOPATH%;"%SCRIPTPATH%\bin"
+set GOPATH="%SCRIPTPATH%\bin"
 
 : run
 if %processor_architecture%==x86 (
diff --git a/bin/run.sh b/bin/run.sh
index 887f64e..2522f13 100644
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -11,7 +11,7 @@ rm -rf $SCRIPTPATH/src/github.com/leanote/leanote # 先删除
 ln -s ../../../../ $SCRIPTPATH/src/github.com/leanote/leanote
 
 # set GOPATH
-export GOPATH=$GOPATH:$SCRIPTPATH
+export GOPATH=$SCRIPTPATH
 
 # run
 osName=`uname` # Darwin or Linux
diff --git a/conf/app.conf b/conf/app.conf
index 67d309a..c46a18e 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -6,6 +6,9 @@ http.port=9000
 
 site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 
+# admin username
+adminUsername=admin
+
 # mongdb
 db.host=localhost
 db.port=27017