make local.js and server.js runnable

shadowsocks · Jun 29, 2013 · a08e3fa · a08e3fa
1 parent eab2a13
commit a08e3fa
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 35 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+1.3.5 2013-06-29
+- Make local.js and server.js runnable
+
 1.3.4 2013-06-29
 - Flush logs when exit with error
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 shadowsocks-nodejs
 ===========
 
-Current version: 1.3.4
+Current version: 1.3.5
 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks-nodejs.png)](https://travis-ci.org/clowwindy/shadowsocks-nodejs)
 
 shadowsocks-nodejs is a lightweight tunnel proxy which can help you get through

diff --git a/lib/shadowsocks/encrypt.js b/lib/shadowsocks/encrypt.js
diff --git a/lib/shadowsocks/local.js b/lib/shadowsocks/local.js
diff --git a/lib/shadowsocks/merge_sort.js b/lib/shadowsocks/merge_sort.js
diff --git a/lib/shadowsocks/server.js b/lib/shadowsocks/server.js
diff --git a/lib/shadowsocks/test.js b/lib/shadowsocks/test.js
diff --git a/lib/shadowsocks/utils.js b/lib/shadowsocks/utils.js
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "description": "a tunnel proxy that help you get through firewalls",
     "keywords": ["shadowsocks", "proxy", "socks5"],
     "author": "clowwindy",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "licenses": [{
         "type": "MIT",
         "url": "https://raw.github.com/clowwindy/shadowsocks-nodejs/master/LICENSE"

diff --git a/src/local.coffee b/src/local.coffee
@@ -278,3 +278,5 @@ exports.main = ->
   s.on "error", (e) ->
     process.stdout.on 'drain', ->
       process.exit 1
+if require.main is module
+  exports.main()
diff --git a/src/server.coffee b/src/server.coffee
@@ -256,3 +256,5 @@ exports.main = ->
           process.exit 1
     )()
 
+if require.main is module 
+  exports.main()
diff --git a/src/utils.coffee b/src/utils.coffee
@@ -24,7 +24,7 @@ exports.parseArgs = ->
       result['verbose'] = true
   result
 
-exports.version = "shadowsocks-nodejs v1.3.4"
+exports.version = "shadowsocks-nodejs v1.3.5"
 
 exports.EVERYTHING = 0
 exports.DEBUG = 1