Changeset 11033 for NEMO/trunk

Timestamp:

2019-05-21T22:36:30+02:00 (5 years ago)

Author:

nicolasmartin

Message:

Modify the shell code in order to run as expected on different OS (Linux or MacOS)

Location:

NEMO/trunk/doc

Files:

• manual_build.sh (modified) (3 diffs)
• tools/shr_func.sh (modified) (1 diff)

NEMO/trunk/doc/manual_build.sh

@@ -16 +16 @@
 fi
 
-## Avoid the use of shell builtin echo (for -e option)
-alias echo='/bin/echo -e'
-
 # Source shared functions
 . tools/shr_func.sh
@@ -31 +28 @@
 ## Retrieve figures if not already there
 if [ ! -d latex/figures ]; then
-   echo "Downloading of shared figures and logos\n"
+   printf "Downloading of shared figures and logos\n\n"
    svn co https://forge.ipsl.jussieu.fr/nemo/svn/utils/figures latex/figures > /dev/null
 fi
@@ -43 +40 @@
 
 for model in $models; do
-   echo $model"\n"
+   echo $model
    clean $model; build $model
-   echo "\t"'¤ End of building run'
-   echo "\t\t"'The export should be available at root'
-   echo "\t\t"'If not check LaTeX log in ./latex/'$model'/main/'$model'_manual.log'"\n"
+   printf "\t¤ End of building run\n"
+   printf "\t  The export should be available at root\n"
+   printf "\t  If not check LaTeX log in ./latex/$model/main/${model}_manual.log\n"
 done
 

NEMO/trunk/doc/tools/shr_func.sh

@@ -1 +1 @@
 #!/bin/sh
 
-alias echo='/bin/echo -e'
+
+## Default options for GNU find (Linux OS)
+find_pre=''; find_suf='-regextype posix-extended'
+
+## Test OS to tweak the options in find command for working in extended mode everywhere
+[ '$( uname )' = 'Darwin' ] && { find_pre='-E'; find_suf=''; }
 
 clean() {
-   ## Not sure if this step is needed, guess latexmk should be able to detect a change
-        echo "\t¤ Clean previous build"
+    ## Not sure if this step is needed, guess latexmk should be able to detect a change
+    printf "\t¤ Clean previous build\n"
 
-        ## Delete temp files from previous build
-   echo "\t\t- delete all temporary files (.aux, .bbl, ...)"
-        find latex/$1 -regextype posix-extended                                                        \
-                      -regex     ".*\.(aux|bbl|blg|dvi|fdb|fls|idx|ilg|ind|log|maf|mtc|out|pdf|toc).*" \
-                      -exec      rm {} \;
+    ## Delete temp files from previous build
+    printf "\t  - delete all temporary files (.aux, .bbl, ...)\n"
+    find ${find_pre} latex/$1 ${find_suf}                                                                \
+                         -regex ".*\.(aux|bbl|blg|dvi|fdb|fls|idx|ilg|ind|log|maf|mtc|out|pdf|toc)" \
+                              -exec rm {} \;
 
-        ## Remove minted folders
-   echo "\t\t- remove pygments input hash files (\"_minted\" folders)"
-        find latex/$1 -type d -name '_minted*' -exec rm -r {} \; 2> /dev/null
+    ## Remove minted folders
+    printf "\t  - remove pygments input hash files (\"_minted\" folders)\n"
+    find latex/$1 -type d -name '_minted*' -exec rm -r {} \; 2> /dev/null
 
-        ## HTML exports
-   #echo '   - possible HTML export'
-        #find latex/$1 -type d -name 'html*'    -exec rm -r {} \;
+    ## HTML exports
+    #printf '   - possible HTML export'
+    #find latex/$1 -type d -name 'html*'    -exec rm -r {} \;
 
-   echo
+    echo
 }
 
 build() {
-        echo "\t¤ Generation of the PDF format\n"
-        cd latex/$1/main
-        latexmk $opts $1'_manual' 1> /dev/null
-        [ -f $1'_manual'.pdf ] && mv $1'_manual'.pdf ../../..
-        cd - > /dev/null
-   echo
+    printf "\t¤ Generation of the PDF format\n"
+    cd latex/$1/main
+    latexmk $opts $1'_manual' 1> /dev/null
+    [ -f $1'_manual'.pdf ] && mv $1'_manual'.pdf ../../..
+    cd - > /dev/null
+    echo
 }