From 3ed5da010f684cf8b4de1872e34392b681afd055 Mon Sep 17 00:00:00 2001
From: Francois B <francois@makotonoblog.be>
Date: Tue, 5 Jun 2018 13:37:59 +0200
Subject: [PATCH] angular cli + typescript added

---
 repo_functions_ub1604.sh | 15 ++++++++++++++-
 repo_functions_ub1804.sh | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh
index 20e8011..f2c4288 100644
--- a/repo_functions_ub1604.sh
+++ b/repo_functions_ub1604.sh
@@ -382,6 +382,8 @@ javascript-common;apt;javascript;javascript-common
 yarn;npm;javascript;yarn
 emma-cli;npm;javascript;emma-cli
 jshint;npm;javascript;jshint
+typescript;npm;javascript;typescript
+@angular/cli;npm;javascript;angularcli
 oracle-java10-installer;apt;java10;oracle-java10-installer
 oracle-java10-set-default;apt;java10;oracle-java10-set-default
 php7.0-cli;apt;php;php7.0-cli
@@ -1241,7 +1243,18 @@ mongodb;mongodb_PostTrtFct
 qttools5-dev-tools;qt_PostTrtFct
 plank;plank_PostTrtFct
 androidstudio;android_PostTrtFct
-nodejs8lts;nodejs8lts_PostTrtFct"
+nodejs8lts;nodejs8lts_PostTrtFct
+angularcli;angularcli_PostTrtFct"
+
+#
+# Angular CLI
+#
+function angularcli_PostTrtFct () {
+  if which yarn >/dev/null; then
+    runCmd "ng set --global packageManager=yarn"
+           "using yarn instead of nom for angular/cli"
+  fi
+}
 
 #
 # NodeJS 8 LTS
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 7dddaf0..6533f66 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -312,6 +312,8 @@ javascript-common;apt;javascript;javascript-common
 yarn;npm;javascript;yarn
 emma-cli;npm;javascript;emma-cli
 jshint;npm;javascript;jshint
+typescript;npm;javascript;typescript
+@angular/cli;npm;javascript;angularcli
 oracle-java10-installer;apt;java10;oracle-java10-installer
 oracle-java10-set-default;apt;java10;oracle-java10-set-default
 php7.0-cli;apt;php;php7.0-cli
@@ -1045,7 +1047,18 @@ mongodb;mongodb_PostTrtFct
 qttools5-dev-tools;qt_PostTrtFct
 plank;plank_PostTrtFct
 androidstudio;android_PostTrtFct
-nodejs8lts;nodejs8lts_PostTrtFct"
+nodejs8lts;nodejs8lts_PostTrtFct
+angularcli;angularcli_PostTrtFct"
+
+#
+# Angular CLI
+#
+function angularcli_PostTrtFct () {
+  if which yarn >/dev/null; then
+    runCmd "ng set --global packageManager=yarn"
+           "using yarn instead of nom for angular/cli"
+  fi
+}
 
 #
 # NodeJS 8 LTS