From 97522021a245738c9153247f08890ed9a2d9db3d Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Tue, 13 Feb 2018 10:46:38 +0100
Subject: [PATCH] idea added by snap + bug fix in installPackage fct

---
 core_functions.sh    |  4 ++--
 install_functions.sh | 22 +++++++++++++++-------
 repo_functions.sh    |  6 +++++-
 yggdrasil.sh         |  2 ++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 19bbab7..d83be95 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -259,7 +259,7 @@ function installAppFromArchive () {
 # TODO: update npm before update/install pkg
 #
 function installPackage () {
-  typeset pkg="$*"
+  typeset pkg="$2"
   typeset ret_code
 
   case $1 in
@@ -318,7 +318,7 @@ function installPackage () {
     if which snap >/dev/null; then
       printf "[SNAP] Installing by $pkg "
       printf "\n[SNAP] installing by $pkg\n" &>> $logFile
-      sudo snap install $pkg &>> $logFile
+      sudo snap install $pkg --classic &>> $logFile
       ret_code=$?
       retCode $ret_code
       printf "\n"
diff --git a/install_functions.sh b/install_functions.sh
index 630b29f..8864c01 100644
--- a/install_functions.sh
+++ b/install_functions.sh
@@ -865,12 +865,19 @@ function installEclipse () {
   fi
 }
 
-#TODO:
+#
+# install IDEA Apps (headless)
+#
 function installIdea () {
-  if which umake >/dev/null; then
-    msg "Umake installing : Idea"
-    sudo umake ide idea
-  fi
+  msg "Installing Intellij-IDEA"
+  installAppsFromList idea
+}
+
+#
+# install IDEA Apps (Menu)
+#
+function installIdeaMenu () {
+  installAppsFromListMenu idea
 }
 
 #
@@ -908,14 +915,15 @@ function installVisualStudioCodeMenu () {
 #
 function installAndroidStudio () {
   msg "Installing Android-Studio"
-  installAppsFromList android-studio
+  installAppsFromList androidstudio
 }
 
 #
 # install Android-Studio Apps (Menu)
 #
 function installAndroidStudioMenu () {
-  installAppsFromListMenu android-studio
+  installAppsFromListMenu androidstudio
+}
 
 #
 # install SublimeText Apps (headless)
diff --git a/repo_functions.sh b/repo_functions.sh
index c691ddb..2765a57 100644
--- a/repo_functions.sh
+++ b/repo_functions.sh
@@ -403,7 +403,8 @@ qttools5-dev-tools;apt;qt;qttools5-dev-tools
 qttools5-examples;apt;qt;qttools5-examples
 qttools5-doc-html;apt;qt;qttools5-doc-html
 fbreader;apt;ebook;fbreader
-android-studio;apt;android-studio;android-studio"
+android-studio;apt;android-studio;android-studio
+intellij-idea-community;snap;idea;idea"
 
 #-----------------------------------------------------------------------------#
 # Specific Repo list and functions                                            #
@@ -479,6 +480,9 @@ function addSpecificRepo_VSCode () {
           "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
 }
 
+#
+# Android-Studio repo
+#
 function addSpecificRepo_AndroidStudio () {
   addPPA "ppa:maarten-fonville/android-studio"
 }
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 307fd1e..1a0ed7f 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -41,6 +41,8 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
 while getopts ":h,v,f,c,t,u" option; do
   case "$option" in
     t) #test purpose only
+      installIdea
+      #installNetTools
       exit
       ;;
     f) # install all apps