Changeset 463 for trunk

Timestamp:

12/14/11 12:54:02 (12 years ago)

Author:

soclod

Message:

amelioration de tex

Location:

trunk/src

Files:

• presentation_lpao.sh (modified) (8 diffs)
• varamma_profile.sh (modified) (3 diffs)

trunk/src/presentation_lpao.sh

@@ -21 +21 @@
 #
 # .. option:: -a application
-#                matlab or octave
+#                matlab or octave 
 #
 # - Run :func:`presentation_lpao` with `octave`` or
@@ -68 +68 @@
 # move this tool in a publication part
 #
+# faire propre sur le pb de détection de la présence de matlab/octave
+# en fonction des systemes
+#
 # EVOLUTIONS
 # ==========
@@ -75 +78 @@
 # $URL$
 #
+# - fplod/soclod 20111214
+#
+#   * affreux patch car octave est un alias sur mac
+#     et les alias ne sont pas connus dans un shell !!
 # - fplod 20110923T074512Z aedon.locean-ipsl.upmc.fr (Darwin)
 #
@@ -92 +99 @@
   echo " www : no specific posix checking"
 ;;
+Darwin)
+  octavecmd=/Applications/Octave.app/Contents/Resources/bin/octave
+  set -o posix
+;;
 *)
   set -o posix
 ;;
 esac
-unset system
 #
 set -u
@@ -119 +129 @@
 #
 # default
-application=octave
+application=${octavecmd}
 #
 minargcount=2
@@ -144 +154 @@
 done
 #
+case ${application} in
+octave)
+ application=${octavecmd}
+;;
+esac
 log=${PROJECT_LOG}/$(basename ${0} .sh).log.${log_date}
 echo "[Context]" 1>> ${log}
@@ -181 +196 @@
  status=${?}
 ;;
-octave)
- ${timecmd} octave --silent ${script} 1>> ${log} 2>&1
+${octavecmd})
+ ${timecmd} ${octavecmd} --silent ${script} 1>> ${log} 2>&1
  status=${?}
 ;;
@@ -211 +226 @@
 #
 unset log_date
+unset system
 #
 exit

trunk/src/varamma_profile.sh

@@ -58 +58 @@
 # MATLABPATH is initialize to tell matlab where find tools.
 #
-# ${VARAMMA_OD} is added to the LaTeX environnement variable ${TEXINPUTS}.
 #
 # SEE ALSO
@@ -130 +129 @@
 #
 # $Id$
+#
+# - fplod/soclod 20111214
+#
+#   *  suppress TEXINPUTS definition : too many side effects
 #
 # - soclod/fplod 20111025
@@ -412 +415 @@
 set -u
 #
-# setup for LaTeX
-set +u
-if [ "${TEXINPUTS}" = "" ]
-then
-    TEXINPUTS=.:${VARAMMA_OD} 
-else
-    TEXINPUTS=.:${TEXINPUTS}:${VARAMMA_OD} 
-fi
-set -u
-export TEXINPUTS
-#
 # setup for matlab
 MATLABPATH=${VARAMMA}