From fc17d19ea33df8fbd87c58a140a029458365e730 Mon Sep 17 00:00:00 2001
From: eficas <>
Date: Wed, 22 May 2002 08:51:05 +0000
Subject: [PATCH] =?utf8?q?F.R:=20-modifs=20proc=C3=A9dure=20d'installation?=
 =?utf8?q?=20et=20suppression=20de=20code=5Faster.gif?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Installation/code_aster.gif | Bin 3515 -> 0 bytes
 Installation/install.py     |  44 ++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100755 Installation/code_aster.gif

diff --git a/Installation/code_aster.gif b/Installation/code_aster.gif
deleted file mode 100755
index 2e4e6913520d90ed5a72aeae48fcaf5162ff7b7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3515
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

diff --git a/Installation/install.py b/Installation/install.py
index 68b57b07..c2fb5c48 100755
--- a/Installation/install.py
+++ b/Installation/install.py
@@ -10,7 +10,7 @@ pmw_min = 85
 test = 0
 
 try:
-    import sys,string,re,types
+    import sys,string,re,types,traceback
     import os,commands
 except Exception,e:
     print "Mauvaise installation de Python"
@@ -186,7 +186,7 @@ class SplashScreen(Tkinter.Toplevel):
     def init(self,args={}):
         self.text = Tkinter.StringVar()
         self.text.set('')
-        self.icone = 'logo_edf.gif'
+        self.icone = 'Editeur/icons/logo_edf.gif'
         self.barre = 'non'
         if args == {} : return
         if args.has_key('text'):
@@ -198,7 +198,7 @@ class SplashScreen(Tkinter.Toplevel):
         else:
             self.code = 'inconnu'
         if self.code == 'ASTER' :
-            self.icone = 'code_aster.gif'
+            self.icone = 'Editeur/icons/code_aster.gif'
         
     def CreateWidgets(self):
         fic_image = os.path.join("./", self.icone)
@@ -347,14 +347,14 @@ class Config(Tkinter.Toplevel):
         # designation, texte d'invite , option par defaut(unix), option par defaut(windows), flag obligatoire/facultatif
         self.l_tx_items = (('rep_install'   ,
                             "Répertoire d'installation :",
-                            'usr/local',
+                            '',
                             '',
                             'o'),
                            ('rep_travail'   ,
                             'Répertoire de travail :',
                             'tmp',
                             'tmp',
-                            'o'),
+                            'f'),
                            ('rep_mat'       ,
                             'Répertoire matériaux :',
                             None,
@@ -368,7 +368,7 @@ class Config(Tkinter.Toplevel):
                             ),
                            ('acrobat'       ,
                             'Exécutable Acrobat Reader :',
-                            'usr/bin/acroread',
+                            '/usr/bin/acroread',
                             'acrobat.exe',
                             'o')
                            )
@@ -465,11 +465,11 @@ class Config(Tkinter.Toplevel):
         self.deactivate_entries()           #  Les entrees et les boutons sont desactivees
         self.deactivate_buttons()           #  pendant les operations d'installation
         #self.decompress_archive()
-        if not os.path.exists(os.path.join(REPERTOIRE,'Eficas')):
-            self.afficher_fatale("Il manque des fichiers d'EFICAS")
-            self.install_running = 0
-            return
-        self.nb_fichiers = self.compte_fichiers(os.path.join(REPERTOIRE,'Eficas'))
+        #if not os.path.exists(os.path.join(REPERTOIRE,'Eficas')):
+        #    self.afficher_fatale("Il manque des fichiers d'EFICAS")
+        #    self.install_running = 0
+        #    return
+        self.nb_fichiers = self.compte_fichiers(REPERTOIRE)
         if self.nb_fichiers == 0:
             self.afficher_fatale("Il manque des fichiers d'EFICAS")
             self.install_running = 0
@@ -483,7 +483,7 @@ class Config(Tkinter.Toplevel):
                 return
         except:
             self.install_running = 0
-            afficher_fatale("Impossible de créer certains répertoires")
+            self.afficher_fatale("Impossible de créer certains répertoires")
             
         # affiche la fenêtre avec la barre de progression
         self.afficher_copie_fichiers()          
@@ -494,11 +494,12 @@ class Config(Tkinter.Toplevel):
                 self.activate_buttons()
                 self.install_running = 0
                 return
-        except:
+        except :
+	    traceback.print_exc()
             self.install_running = 0
-            afficher_fatale("Impossible de copier certains fichiers")
+            self.afficher_fatale("Impossible de copier certains fichiers")
 
-        self.rm_temp_dirs()                     # efface les répertoires temporaires
+        #self.rm_temp_dirs()                     # efface les répertoires temporaires
         try:
             self.creer_fic_conf()                   # crée le fichier eficas.conf
         except:
@@ -771,19 +772,18 @@ class Config(Tkinter.Toplevel):
         Crée le fichier editeur.ini a partir des données saisies
         par l'administrateur.
         """
-        fichier_conf = os.path.join(self.normaliser_chemin(self.rep_install.get_valeur()),"Eficas/Accas/editeur.ini")
+        fichier_conf = os.path.join(self.normaliser_chemin(self.rep_install.get_valeur()),"Eficas/Aster/editeur.ini")
         f = open(fichier_conf,'w')
         f.write("path_doc        =    "+'"'+self.normaliser_chemin(self.rep_docaster.get_valeur())+'"\n')
         f.write("exec_acrobat    =    "+'"'+self.normaliser_chemin(self.acrobat.get_valeur())+'"\n')
         f.write('isdeveloppeur   =    "NON"\n')
         f.write("rep_travail     =    "+'"'+self.normaliser_chemin(self.rep_travail.get_valeur())+'"\n')
-        f.write("rep_cata        =    "+'"'+os.path.join(self.normaliser_chemin(self.rep_install.get_valeur()),"Eficas/Cata")+'"/\n') # attention au dernier slash
+        f.write("rep_cata        =    "+'"'+os.path.join(self.normaliser_chemin(self.rep_install.get_valeur()),"Eficas/Aster/Cata/")+'"\n') # attention au dernier slash
         f.write("rep_mat         =    "+'"'+self.normaliser_chemin(self.rep_mat.get_valeur())+'"\n')
-        cata = """catalogues = (('ASTER','v5',rep_cata + 'cata_aster_v5.py','defaut'),
-              ('ASTER','v6',rep_cata + 'cata_aster_v6.py')
-             )\n"""
+        cata = """catalogues = (('ASTER','v6',rep_cata + 'cata_STA6.py','python','defaut'),)\n"""
         f.write(cata)
         f.close()
+	
 
     def move_files(self):
         """
@@ -792,7 +792,7 @@ class Config(Tkinter.Toplevel):
         """
         # création du répertoire Eficas
         rep_eficas = os.path.join(self.rep_install.get_valeur(),'Eficas')
-        self.copy_rep(os.path.join(REPERTOIRE,'Eficas'),rep_eficas)
+        self.copy_rep(REPERTOIRE,rep_eficas)
 
     def copy_rep(self,rep_dep,rep_arr):
         """
@@ -810,7 +810,7 @@ class Config(Tkinter.Toplevel):
                 commande_delete= self.d_commandes['delete']+nom_complet_dep
                 try:
                     os.system(commande_copie)
-                    os.system(commande_delete)
+                    #os.system(commande_delete)
                     self.attente.update_barre()
                 except Exception,e:
                     pass
-- 
2.39.2