v1.4.2 released

bin/release.sh

@@ -9,7 +9,7 @@ SP=$(cd "$(dirname "$0")"; pwd)
 tmp="/Users/life/Desktop/leanote_release"
 
 # version
-V="v1.4.1"
+V="v1.4.2"
 
 ##=================================
 # 1. 先build 成 3个平台, 2种bit = 6种
@@ -124,9 +124,9 @@ function tarRelease()
 		suffix=""
 		if [ $2 = "arm" ]
 		then
-			cp ./bin/run_arm.sh $tmp/leanote/bin/run.sh
+			cp ./bin/run-arm.sh $tmp/leanote/bin/run.sh
 		else
-			cp ./bin/run.sh $tmp/leanote/bin/
+			cp ./bin/run-$1-$2.sh $tmp/leanote/bin/run.sh
 		fi
 	else
 		cp ./bin/run.bat $tmp/leanote/bin/

bin/run.sh → bin/run-darwin-amd64.sh

@@ -13,17 +13,6 @@ ln -s ../../../../ $SCRIPTPATH/src/github.com/leanote/leanote
 # set GOPATH
 export GOPATH=$SCRIPTPATH
 
-# run
-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"
+script="$SCRIPTPATH/leanote-darwin-amd64"
 chmod 777 $script
 $script -importPath github.com/leanote/leanote

bin/run-linux-386.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+SCRIPTPATH=$(cd "$(dirname "$0")"; pwd)
+
+# set link
+
+path="$SCRIPTPATH/src/github.com/leanote"
+if [ ! -d "$path" ]; then
+	mkdir -p "$path"
+fi
+rm -rf $SCRIPTPATH/src/github.com/leanote/leanote # 先删除
+ln -s ../../../../ $SCRIPTPATH/src/github.com/leanote/leanote
+
+# set GOPATH
+export GOPATH=$SCRIPTPATH
+
+script="$SCRIPTPATH/leanote-linux-386"
+chmod 777 $script
+$script -importPath github.com/leanote/leanote

bin/run-linux-amd64.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+SCRIPTPATH=$(cd "$(dirname "$0")"; pwd)
+
+# set link
+
+path="$SCRIPTPATH/src/github.com/leanote"
+if [ ! -d "$path" ]; then
+	mkdir -p "$path"
+fi
+rm -rf $SCRIPTPATH/src/github.com/leanote/leanote # 先删除
+ln -s ../../../../ $SCRIPTPATH/src/github.com/leanote/leanote
+
+# set GOPATH
+export GOPATH=$SCRIPTPATH
+
+script="$SCRIPTPATH/leanote-linux-amd64"
+chmod 777 $script
+$script -importPath github.com/leanote/leanote

public/js/app/page.js

@@ -528,7 +528,8 @@ function initEditor() {
 		// content_css 不再需要
 		// content_css : [LEA.sPath + "/css/editor/editor.css"], // .concat(em.getWritingCss()),
 		skin : "custom",
-		language: LEA.locale, // 语言
+		// tinymce just support en & zh lang currently
+		language: LEA.locale != 'en' && LEA.locale != 'zh' ? 'en' : LEA.locale,
 		plugins : [
 				"autolink link leaui_image lists hr", "paste",
 				"searchreplace leanote_nav leanote_code tabfocus",