X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=checkinstall.py;h=34b37480f7828d09405bafb7990b0833f5a95777;hp=11522909ae6d0b7498a4237435061cb8b82aae5a;hb=fc1209a72127935ef90645314dff26bb6fd2a1d4;hpb=60192e229cbe0a71035348899f38d745a8a10380

diff --git a/checkinstall.py b/checkinstall.py
index 1152290..34b3748 100644
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -100,15 +100,14 @@ def FindRPAthWin32():
     if progpaths != [] :
         for progpath in progpaths :
             rpath = os.path.join(progpath, "R")
-        if os.path.exists(rpath) :
-            for amj in range(2,6) :
-                for i in range(0,50):
-                    for j in range(0,50):
-                        for poss in ['', 'i386', 'x64'] :
-                            path=os.path.join(rpath,"R-3."+str(i)+"."+str(j),'bin',poss,'R.exe')
-                            print path
-                            if os.path.exists(path):
-                                BestPath=path
+            if os.path.exists(rpath) :
+                for maj in range(2,4) :
+                    for i in range(0,30):
+                        for j in range(0,20):
+                            for poss in ['', 'i386', 'x64'] :
+                                path=os.path.join(rpath,"R-%i.%i.%i" % (maj, i, j),'bin',poss,'R.exe')
+                                if os.path.exists(path):
+                                    BestPath=path
     return BestPath
 
 def FindRPathNix():
@@ -204,7 +203,7 @@ Sans ces bibliothèques, IRamuteq ne fonctionnera pas.
             dlg.Destroy()
         dial.Destroy()
     if nolib == [] : 
-        #self.pref.set('iramuteq', 'rlibs', True)
+        self.pref.set('iramuteq', 'rlibs', True)
         with open(self.ConfigPath['preferences'], 'w') as f :
             self.pref.write(f)
         return True