projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
...
[iramuteq]
/
checkinstall.py
diff --git
a/checkinstall.py
b/checkinstall.py
index
38640ed
..
d5c59d1
100644
(file)
--- a/
checkinstall.py
+++ b/
checkinstall.py
@@
-7,7
+7,7
@@
import os
import sys
import shutil
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
from functions import exec_rcode, exec_RCMD
import wx
import tempfile
@@
-54,8
+54,11
@@
def UpgradeConf(self) :
def CreateIraDirectory(UserConfigPath,AppliPath):
if not os.path.exists(UserConfigPath):
os.mkdir(UserConfigPath)
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) :
def CopyConf(self) :
+ log.info('Copy conf')
DictUser = self.ConfigPath
DictAppli = ConstructConfigPath(self.AppliPath,user=False)
for item, filein in DictUser.iteritems():
DictUser = self.ConfigPath
DictAppli = ConstructConfigPath(self.AppliPath,user=False)
for item, filein in DictUser.iteritems():
@@
-67,6
+70,12
@@
def CopyConf(self) :
if item == u'preferences' :
if not os.path.exists(filein) :
shutil.copyfile(DictAppli[item],filein)
if item == u'preferences' :
if not os.path.exists(filein) :
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])
def CheckRPath(PathPath):
if not os.path.exists(PathPath.get('PATHS','rpath')):
def CheckRPath(PathPath):
if not os.path.exists(PathPath.get('PATHS','rpath')):