diff --git a/app/views/home/header.html b/app/views/home/header.html index 99b4558..ffc8bab 100644 --- a/app/views/home/header.html +++ b/app/views/home/header.html @@ -42,7 +42,6 @@ function log(o) { <!-- <li><a href="/index#aboutLeanote" target="#aboutLeanote" class="smooth-scroll">{{msg . "aboutLeanote"}}</a> </li> --> - <li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li> <li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li> <li><a id="leanoteBlog" href="http://lea.leanote.com" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li> <li style="position: relative; margin-right: 3px;"> diff --git a/bin/release.sh b/bin/release.sh index 6fd1b83..78802e3 100644 --- a/bin/release.sh +++ b/bin/release.sh @@ -75,6 +75,10 @@ cp -r ./app/views $tmp/leanote/app # conf cp ./conf/app.conf $tmp/leanote/conf/app.conf cp ./conf/routes $tmp/leanote/conf/routes +# 处理app.conf, 还原配置 +cat $tmp/leanote/conf/app.conf | sed 's/db.dbname=leanote.*#/db.dbname=leanote #/' > $tmp/leanote/conf/app.conf2 # 不能直接覆盖 +rm $tmp/leanote/conf/app.conf +mv $tmp/leanote/conf/app.conf2 $tmp/leanote/conf/app.conf # others cp -r ./messages ./public ./mongodb_backup $tmp/leanote/ diff --git a/bin/run.sh b/bin/run.sh index 2832656..887f64e 100644 --- a/bin/run.sh +++ b/bin/run.sh @@ -17,6 +17,13 @@ export GOPATH=$GOPATH:$SCRIPTPATH osName=`uname` # Darwin or Linux osName=`tr '[A-Z]' '[a-z]' <<<"$osName"` # toLowerCase bit=`getconf LONG_BIT` # 32, 64 +if [ $bit = "64" ] +then + bit="amd64" +else + bit="386" +fi + script="$SCRIPTPATH/leanote-$osName-$bit" chmod 777 $script $script -importPath github.com/leanote/leanote \ No newline at end of file