Package: astk / 1.13.1-2

0001-config.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
From: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Date: Mon, 7 Apr 2014 09:03:06 +0200
Subject: config

---
 ASTK_CLIENT/bin/astk           |   19 ++++---------------
 ASTK_CLIENT/bin/bsf            |   19 ++++---------------
 ASTK_CLIENT/etc/astkrc/outils  |    8 ++++----
 ASTK_SERV/bin/as_run           |   17 +++--------------
 ASTK_SERV/bin/auto_update.cron |   17 ++++++++++++++---
 ASTK_SERV/bin/parallel_cp      |   17 +++--------------
 ASTK_SERV/etc/asrun            |   22 +++++++++++-----------
 ASTK_SERV/etc/aster            |    2 +-
 ASTK_SERV/etc/profile.csh      |   30 ++++++------------------------
 ASTK_SERV/etc/profile.sh       |   29 ++++++++++-------------------
 10 files changed, 60 insertions(+), 120 deletions(-)

diff --git a/ASTK_CLIENT/bin/astk b/ASTK_CLIENT/bin/astk
index 9e65825..1de34da 100755
--- a/ASTK_CLIENT/bin/astk
+++ b/ASTK_CLIENT/bin/astk
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
 
 # ==============================================================================
 # COPYRIGHT (C) 1991 - 2003  EDF R&D                  WWW.CODE-ASTER.ORG
@@ -17,21 +17,10 @@
 #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
 # ==============================================================================
 
-set_prefix() {
-    local this=`readlink -n -f $1`
-    local bin=`dirname $this`
-    prefix=`dirname $bin`
-}
-
-set_prefix $0
-
-ASTER_ROOT=$prefix
-ASTER_ETC=$ASTER_ROOT/etc
-if [ "$ASTER_ROOT" = "/usr" ]; then
+if [ -z "$ASTER_ETC" ]; then
     ASTER_ETC=/etc
+    export ASTER_ETC
 fi
-export ASTER_ROOT
-export ASTER_ETC
 
 # set environment
 if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
@@ -43,5 +32,5 @@ if [ -z "$WISHEXECUTABLE" ]; then
    WISHEXECUTABLE=wish
 fi
 
-$WISHEXECUTABLE $ASTER_ROOT/lib/astk/astk.tcl -- $* &
+$WISHEXECUTABLE /usr/share/astk/astk.tcl -- $* &
 
diff --git a/ASTK_CLIENT/bin/bsf b/ASTK_CLIENT/bin/bsf
index 2617929..64b50a2 100755
--- a/ASTK_CLIENT/bin/bsf
+++ b/ASTK_CLIENT/bin/bsf
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
 
 # ==============================================================================
 # COPYRIGHT (C) 1991 - 2003  EDF R&D                  WWW.CODE-ASTER.ORG
@@ -17,21 +17,10 @@
 #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
 # ==============================================================================
 
-set_prefix() {
-    local this=`readlink -n -f $1`
-    local bin=`dirname $this`
-    prefix=`dirname $bin`
-}
-
-set_prefix $0
-
-ASTER_ROOT=$prefix
-ASTER_ETC=$ASTER_ROOT/etc
-if [ "$ASTER_ROOT" = "/usr" ]; then
+if [ -z "$ASTER_ETC" ]; then
     ASTER_ETC=/etc
+    export ASTER_ETC
 fi
-export ASTER_ROOT
-export ASTER_ETC
 
 # set environment
 if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
@@ -43,5 +32,5 @@ if [ -z "$WISHEXECUTABLE" ]; then
    WISHEXECUTABLE=wish
 fi
 
-$WISHEXECUTABLE $ASTER_ROOT/lib/astk/bsf.tcl -- $* &
+$WISHEXECUTABLE /usr/share/astk/bsf.tcl -- $* &
 
diff --git a/ASTK_CLIENT/etc/astkrc/outils b/ASTK_CLIENT/etc/astkrc/outils
index 6935289..03ea48f 100644
--- a/ASTK_CLIENT/etc/astkrc/outils
+++ b/ASTK_CLIENT/etc/astkrc/outils
@@ -4,22 +4,22 @@
 astkrc_version : 1.1
 #
 nom : Eficas
-cmde : ?TOOLS_DIR?/eficas (@F)
+cmde : /usr/lib/codeaster/outils/eficasQt (@F)
 ext : comm com0 com1 com2
 dist : on
 #
 nom : Gmsh
-cmde : ?TOOLS_DIR?/gmsh (@F)
+cmde : /usr/lib/codeaster/outils/gmsh (@F)
 ext : geo msh pos
 dist : on
 #
 nom : Gibi
-cmde : ?TOOLS_DIR?/gibi.x (@F)
+cmde : /usr/lib/codeaster/outils/gibi.x (@F)
 ext : datg dgibi
 dist : on
 #
 nom : Grace
-cmde : ?TOOLS_DIR?/xmgrace (@F)
+cmde : /usr/lib/codeaster/outils/xmgrace (@F)
 ext : dat
 dist : on
 #
diff --git a/ASTK_SERV/bin/as_run b/ASTK_SERV/bin/as_run
index b006f74..c9f3391 100755
--- a/ASTK_SERV/bin/as_run
+++ b/ASTK_SERV/bin/as_run
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
 
 # ==============================================================================
 # COPYRIGHT (C) 1991 - 2003  EDF R&D                  WWW.CODE-ASTER.ORG
@@ -17,21 +17,10 @@
 #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
 # ==============================================================================
 
-set_prefix() {
-    local this=`readlink -n -f $1`
-    local bin=`dirname $this`
-    prefix=`dirname $bin`
-}
-
-set_prefix $0
-
-ASTER_ROOT=$prefix
-ASTER_ETC=$ASTER_ROOT/etc
-if [ "$ASTER_ROOT" = "/usr" ]; then
+if [ -z "$ASTER_ETC" ]; then
     ASTER_ETC=/etc
+    export ASTER_ETC
 fi
-export ASTER_ROOT
-export ASTER_ETC
 
 # set environment
 if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
diff --git a/ASTK_SERV/bin/auto_update.cron b/ASTK_SERV/bin/auto_update.cron
index 18cb81c..bc1afa6 100755
--- a/ASTK_SERV/bin/auto_update.cron
+++ b/ASTK_SERV/bin/auto_update.cron
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
 
 # cron script to update (and build) Code_Aster versions
 
@@ -27,6 +27,17 @@ MAIL_DEST=
 
 
 # Code_Aster root directory
+
+if [ -z "$ASTER_ETC" ]; then
+    ASTER_ETC=/etc
+    export ASTER_ETC
+fi
+
+# set environment
+if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
+    . $ASTER_ETC/codeaster/profile.sh
+fi
+
 set_prefix() {
    local here=`readlink -n -f $1`
    local bin=`dirname $here`
@@ -80,7 +91,7 @@ do
 ================================================================================
 
 EOF
-   ${ASTER_ROOT}/bin/as_run --auto_update ${loc} \
+   /usr/bin/as_run --auto_update ${loc} \
                             --report_to=${MAIL_DEST} \
                             --vers=${vers} \
                                                 >> ${LOG_FILE} 2>> ${ERR_FILE}
@@ -97,7 +108,7 @@ do
 ================================================================================
 
 EOF
-   ${ASTER_ROOT}/bin/as_run --make \
+   /usr/bin/as_run --make \
                             --report_to=${MAIL_DEST} \
                             --vers=${vers} \
                                                 >> ${LOG_FILE} 2>> ${ERR_FILE}
diff --git a/ASTK_SERV/bin/parallel_cp b/ASTK_SERV/bin/parallel_cp
index 7f016f4..cf9d061 100755
--- a/ASTK_SERV/bin/parallel_cp
+++ b/ASTK_SERV/bin/parallel_cp
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
 
 # ==============================================================================
 # COPYRIGHT (C) 1991 - 2003  EDF R&D                  WWW.CODE-ASTER.ORG
@@ -17,21 +17,10 @@
 #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
 # ==============================================================================
 
-set_prefix() {
-    local this=`readlink -n -f $1`
-    local bin=`dirname $this`
-    prefix=`dirname $bin`
-}
-
-set_prefix $0
-
-ASTER_ROOT=$prefix
-ASTER_ETC=$ASTER_ROOT/etc
-if [ "$ASTER_ROOT" = "/usr" ]; then
+if [ -z "$ASTER_ETC" ]; then
     ASTER_ETC=/etc
+    export ASTER_ETC
 fi
-export ASTER_ROOT
-export ASTER_ETC
 
 # set environment
 if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
diff --git a/ASTK_SERV/etc/asrun b/ASTK_SERV/etc/asrun
index f66783c..2602e4f 100644
--- a/ASTK_SERV/etc/asrun
+++ b/ASTK_SERV/etc/asrun
@@ -212,10 +212,10 @@ batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel
 # mpirun
 #    available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
 #    (use Python string formatting style)
-mpirun_cmd : ?MPIRUN? -np %(mpi_nbcpu)s --hostfile %(mpi_hostfile)s %(program)s
+mpirun_cmd : mpirun -np %(mpi_nbcpu)s --hostfile %(mpi_hostfile)s %(program)s
 
 # file which contains list of hosts (REQUIRED even if it is not used in mpirun_cmd)
-mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
+mpi_hostfile : /etc/codeaster/aster-mpihosts
 
 # command called to initialize MPI environment (for example for mpich2)
 #mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
@@ -229,7 +229,7 @@ mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
 # OpenMPI (1.3) : echo $OMPI_MCA_orte_ess_vpid
 # OpenMPI (1.34 : echo $OMPI_COMM_WORLD_RANK
 # Mpich2  : echo $PMI_RANK
-mpi_get_procid_cmd : echo $PMI_RANK
+mpi_get_procid_cmd : echo $OMPI_MCA_orte_ess_vpid
 
 # should heavily decrease the elapsed time copying the environment
 # for a lot of processors (but not yet very qualified, may fail)
@@ -248,10 +248,10 @@ use_parallel_cp : no
 
 #-------------------------------------------------------------------------------
 # ps commands : uncomment lines corresponding to your platform
-#ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
-#ps_pid : /bin/ps -e --width=512 -opid -ocommand
-ps_cpu : ?PS_COMMAND_CPU?
-ps_pid : ?PS_COMMAND_PID?
+ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
+ps_pid : /bin/ps -e --width=512 -opid -ocommand
+#ps_cpu : ?PS_COMMAND_CPU?
+#ps_pid : ?PS_COMMAND_PID?
 
 #-------------------------------------------------------------------------------
 # debug command :
@@ -261,13 +261,13 @@ ps_pid : ?PS_COMMAND_PID?
 #  @d will be replaced by the string 'where ; quit'
 #  @a will be replaced by the arguments of Code_Aster command line
 #
-#cmd_post : gdb -batch --command=@D @E @C
+cmd_post : gdb -batch --command=@D @E @C
 #cmd_dbg : gdb --command=@D @E
-#cmd_dbg : ddd --debugger gdb --command=@D @E @C
+cmd_dbg : ddd --debugger gdb --command=@D @E @C
 #cmd_dbg : idb -gui -gdb -command @D -exec @E
 #cmd_dbg : nemiver @E @a
-cmd_post : ?DEBUGGER_COMMAND_POST?
-cmd_dbg : ?DEBUGGER_COMMAND?
+#cmd_post : ?DEBUGGER_COMMAND_POST?
+#cmd_dbg : ?DEBUGGER_COMMAND?
 
 #-------------------------------------------------------------------------------
 # [OPTIONNAL]
diff --git a/ASTK_SERV/etc/aster b/ASTK_SERV/etc/aster
index 1a462d2..edd7caa 100644
--- a/ASTK_SERV/etc/aster
+++ b/ASTK_SERV/etc/aster
@@ -3,7 +3,7 @@
 # examples : NEW11, /usr/lib/codeaster/NEW11
 
 # default version (overridden by --vers option)
-default_vers : ?ASTER_VERSION?
+default_vers : STA10.6
 
 # available versions
 # DO NOT EDIT FOLLOWING LINE !
diff --git a/ASTK_SERV/etc/profile.csh b/ASTK_SERV/etc/profile.csh
index cd17203..e13e840 100644
--- a/ASTK_SERV/etc/profile.csh
+++ b/ASTK_SERV/etc/profile.csh
@@ -14,37 +14,19 @@ if (!($?DEFINE_PROFILE_ASRUN) || !($?LD_LIBRARY_PATH)) then
 
 if !($?ASTER_ROOT) then
     # from first installation
-    setenv ASTER_ROOT ?ASTER_ROOT?
-endif
-setenv ASTER_ETC $ASTER_ROOT/etc
-if ( "X$ASTER_ROOT" == "X/usr" ) then
-   setenv ASTER_ETC /etc
-endif
-
-if !($?PATH) then
-   setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils
-else
-   setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
+    setenv ASTER_ROOT /usr/lib/codeaster
+    setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
 endif
 
-if !($?LD_LIBRARY_PATH) then
-   setenv LD_LIBRARY_PATH ?HOME_PYTHON?/lib
-else
-   setenv LD_LIBRARY_PATH ?HOME_PYTHON?/lib:$LD_LIBRARY_PATH
+if (!$?ASTER_ETC) then
+   setenv ASTER_ETC /etc
 endif
 
-if !($?PYTHONPATH) then
-   setenv PYTHONPATH ?ASRUN_SITE_PKG?
-else
-   setenv PYTHONPATH ?ASRUN_SITE_PKG?:$PYTHONPATH
-endif
 
-setenv PYTHONEXECUTABLE ?PYTHON_EXE?
+setenv PYTHONEXECUTABLE /usr/bin/python
 
-# this should not be usefull...
-#setenv PYTHONHOME ?HOME_PYTHON?
 
-setenv WISHEXECUTABLE ?WISH_EXE?
+setenv WISHEXECUTABLE /usr/bin/wish
 
 
 # source local profile
diff --git a/ASTK_SERV/etc/profile.sh b/ASTK_SERV/etc/profile.sh
index ef9c41e..aa8b983 100644
--- a/ASTK_SERV/etc/profile.sh
+++ b/ASTK_SERV/etc/profile.sh
@@ -13,14 +13,17 @@ if [ -z "$DEFINE_PROFILE_ASRUN" ] || [ -z "$LD_LIBRARY_PATH" ]; then
 #--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
 
 if [ -z "$ASTER_ROOT" ]; then
-    [ -z "${BASH_SOURCE[0]}" ] && here=$0 || here=${BASH_SOURCE[0]}
-    ASTER_ROOT=`dirname $(dirname $(dirname $(readlink -f ${here})))`
-    export ASTER_ROOT
+    export ASTER_ROOT=/usr/lib/codeaster
 fi
-ASTER_ETC=$ASTER_ROOT/etc
-if [ "$ASTER_ROOT" = "/usr" ]; then
+
+if [ "$ASTER_ROOT" = "/usr/lib/codeaster" ]; then
    ASTER_ETC=/etc
 fi
+
+if [ -z "$ASTER_ETC" ]; then
+   ASTER_ETC=/etc
+fi
+  
 export ASTER_ETC
 
 if [ -z "$PATH" ]; then
@@ -29,24 +32,12 @@ else
     export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
 fi
 
-if [ -z "$LD_LIBRARY_PATH" ]; then
-    export LD_LIBRARY_PATH=?HOME_PYTHON?/lib
-else
-    export LD_LIBRARY_PATH=?HOME_PYTHON?/lib:$LD_LIBRARY_PATH
-fi
-
-if [ -z "$PYTHONPATH" ]; then
-    export PYTHONPATH=?ASRUN_SITE_PKG?
-else
-    export PYTHONPATH=?ASRUN_SITE_PKG?:$PYTHONPATH
-fi
-
-export PYTHONEXECUTABLE=?PYTHON_EXE?
+export PYTHONEXECUTABLE=/usr/bin/python
 
 # this should not be usefull...
 #export PYTHONHOME=?HOME_PYTHON?
 
-export WISHEXECUTABLE=?WISH_EXE?
+export WISHEXECUTABLE=/usr/bin/wish
 
 
 # source local profile