X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=checkinstall.py;h=93aa358c5dc5bdf5742337277861a524eb322748;hp=d5c59d10c878457e09fbf240f7f0fb884d415b81;hb=342d693d835ba1077fe0f31824664a807cafa3bb;hpb=0ddddd038d216355e285058b9308f1975de0105a

diff --git a/checkinstall.py b/checkinstall.py
index d5c59d1..93aa358 100644
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -45,11 +45,17 @@ def IsNew(self):
                 return True
 
 def UpgradeConf(self) :
+    log.info('upgrade conf')
     dictuser = self.ConfigPath
     dictappli = ConstructConfigPath(self.AppliPath, user = False)
     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):
@@ -58,7 +64,6 @@ def CreateIraDirectory(UserConfigPath,AppliPath):
         os.mkdir(os.path.join(UserConfigPath, 'dictionnaires'))
 
 def CopyConf(self) :
-    log.info('Copy conf')
     DictUser = self.ConfigPath
     DictAppli = ConstructConfigPath(self.AppliPath,user=False)
     for item, filein in DictUser.iteritems():
@@ -72,7 +77,6 @@ def CopyConf(self) :
                 shutil.copyfile(DictAppli[item],filein)
     dicoUser = self.DictPath
     dicoAppli = ConstructDicoPath(self.AppliPath)
-    log.info(dicoAppli)
     for fi in dicoUser :
         if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]):
             shutil.copyfile(dicoAppli[fi], dicoUser[fi])
@@ -97,7 +101,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):
@@ -134,7 +138,7 @@ def install_textometrieR(self) :
     dlg.Destroy()
 
 def CheckRPackages(self):
-    listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'textometrieR']
+    listdep = ['ca', 'rgl', '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)