jsengine to symlinks optionally

iliakan · iliakan · commit 3c924869151a · 2018-09-05T10:51:02.000+03:00
diff --git a/.gitmodules b/.gitmodules
diff --git a/dev b/dev
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-: ${1?"Usage: $0 <language>"}
+: ${1?"Usage: $0 <server language>"}
 
 set -e
 
diff --git a/edit b/edit
@@ -1,10 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-: ${1?"Usage: $0 <language>"}
+# ./edit ru <- tutorial language: RU, server: EN
+# ./edit ru ru <- tutorial language: RU, server: RU
 
-BRANCH="${1:-$NODE_LANG}"
+: ${1?"Usage: $0 <tutorial language> [<server language>]"}
 
-export NODE_LANG=$BRANCH
+
+export TUTORIAL_ROOT="../javascript-tutorial-$1"
+export NODE_LANG="${2:-en}"
 export NODE_ENV=production
 export TUTORIAL_EDIT=1
 export NODE_PRESERVE_SYMLINKS=1
diff --git a/edit.cmd b/edit.cmd
@@ -1,5 +1,6 @@
 @if "%~1"=="" goto usage
 
+export TUTORIAL_ROOT="../javascript-tutorial-%1"
 @set NODE_LANG=%1
 @set NODE_ENV=production
 @set TUTORIAL_EDIT=1
@@ -14,4 +15,4 @@ goto :eof
 
 :usage
 echo Usage: %0 <Language>
-exit /B 1
+exit /B 1
diff --git a/modules/config/index.js b/modules/config/index.js
@@ -60,11 +60,21 @@ let config = module.exports = {
   tmpRoot:               path.join(process.cwd(), 'tmp'),
   // js/css build versions
   cacheRoot:          path.join(process.cwd(), 'cache'),
-  tutorialGithubBaseUrl: 'https://github.com/iliakan/javascript-tutorial-' + lang + '/tree/master',
 
   handlers: require('./handlers')
 };
 
+let repos = require('jsengine/koa/tutorial/repos');
+for(let repo in repos) {
+  if (repos[repo].lang === lang) {
+    config.tutorialRepo = {
+      github: repo,
+      branch: repos[repo].branch || 'master',
+      url: new URL('https://github.com/' + repo + '/tree/' + (repos[repo].branch || 'master'))
+    }
+  }
+}
+
 require.extensions['.yml'] = function(module, filename) {
   module.exports = yaml.safeLoad(fs.readFileSync(filename, 'utf-8'));
 };
diff --git a/modules/jsengine b/modules/jsengine
