Merge branch 'master' of http://www.netdig.org/git/iramuteq

[iramuteq] / checkinstall.py

diff --git a/checkinstall.py b/checkinstall.py
index 38640ed..9dac15e 100644 (file)
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -7,7 +7,7 @@
 import os
 import sys
 import shutil
-from chemins import ConstructConfigPath
+from chemins import ConstructConfigPath, ConstructDicoPath
 from functions import exec_rcode, exec_RCMD
 import wx
 import tempfile
@@ -50,10 +50,17 @@ def UpgradeConf(self) :
     for item,filein in dictuser.iteritems():
         if not item == u'global' and not item == u'history':
             shutil.copyfile(dictappli[item], filein)
+    dicoUser = self.DictPath
+    dicoAppli = ConstructDicoPath(self.AppliPath)
+    for fi in dicoUser :
+        if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]):
+            shutil.copyfile(dicoAppli[fi], dicoUser[fi])
 
 def CreateIraDirectory(UserConfigPath,AppliPath):
     if not os.path.exists(UserConfigPath):
         os.mkdir(UserConfigPath)
+    if not os.path.exists(os.path.join(UserConfigPath, 'dictionnaires')) :
+        os.mkdir(os.path.join(UserConfigPath, 'dictionnaires'))
 
 def CopyConf(self) :
     DictUser = self.ConfigPath
@@ -67,6 +74,11 @@ def CopyConf(self) :
         if item == u'preferences' :
             if not os.path.exists(filein) :
                 shutil.copyfile(DictAppli[item],filein)
+    dicoUser = self.DictPath
+    dicoAppli = ConstructDicoPath(self.AppliPath)
+    for fi in dicoUser :
+        if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]):
+            shutil.copyfile(dicoAppli[fi], dicoUser[fi])
 
 def CheckRPath(PathPath):
     if not os.path.exists(PathPath.get('PATHS','rpath')):
@@ -88,7 +100,7 @@ def FindRPAthWin32():
         for progpath in progpaths :
             rpath = os.path.join(progpath, "R")
         if os.path.exists(rpath) :
-            for i in range(7,20):
+            for i in range(13,20):
                 for j in range(0,15):
                     path=os.path.join(rpath,"R-2."+str(i)+"."+str(j),'bin','R.exe')
                     if os.path.exists(path):
@@ -125,7 +137,7 @@ def install_textometrieR(self) :
     dlg.Destroy()
 
 def CheckRPackages(self):
-    listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'textometrieR']
+    listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'irlba', 'textometrieR']
     nolib = []
     i=0
     dlg = wx.ProgressDialog("Test des librairies de R", "test en cours...", maximum = len(listdep), parent=self, style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT)