Menu

foam-extend-3.1 Merge Request #7: Use etc/bashrc for all shells (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Bernhard Gschaider wants to merge 28 commits from /u/bgschaid/openfoam-extend/ to nextRelease, 2015-05-14

I sketched this before: maintaining bashrc and cshrc in parallel is a pain in the a##. The idea of this patch is to use etc/bashrc as the definite version. All other shells get their environment variables and aliases from there (the python-script getVariables.py transforms them into a form that the shell "understands"). The actual shell script only has to "source" the output of the Python-script

To support a new shell getVariables.py has to be adapted and a small shell-script that reads this output has to be written. As a proof of concept this has been done for http://fishshell.com whose syntax differs from bash and csh

Added shell scripts are
etc/fishrc: the script for the fishshell
etc/zshrc: used for zsh (although zsh CAN work with ect/bashrc)
etc/tcshrc: the shell-script that is targeted to replace etc/cshrc. Once it has been successfully tested cshrc can be removed. Now also aliases like "wm32" work for this shell

The python-script supports python 2.x and python 3.x (so the solution is "future-proof")

Commit Date  
[1a6754] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Add a line to the release notes

2014-07-31 23:27:29 Tree
[5e2b38] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Make sure that the aliases that source the tcshrc still work

2014-07-31 23:15:57 Tree
[7d682e] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Merge in nextRelease

2014-07-29 22:15:18 Tree
[e987f0] by Bernhard Gschaider Bernhard Gschaider

For some reason quotes are needed on Linux

2014-07-21 14:48:58 Tree
[6801fa] (HEADnextRelease) by Hrvoje Jasak Hrvoje Jasak

01 and 01DC for SuperBee

2014-07-15 09:39:43 Tree
[4874fe] by Hrvoje Jasak Hrvoje Jasak

Merge remote-tracking branch 'origin/BUGFIX/Intel14Port' into nextRelease

2014-07-11 14:39:58 Tree
[5b594f] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Catch the exception in Python2 or Python 3

2014-07-10 09:38:13 Tree
[ec2a35] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Make the script more stable (exception catching etc)

2014-07-09 15:55:36 Tree
[0a1e6e] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Now there is also a script for tcsh

--HG--
rename : etc/zshrc => etc/tcshrc

2014-07-09 11:38:24 Tree
[05efb8] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Added fish-shell to demonstrate that this approach allows completely different shells

--HG--
rename : etc/zshrc => etc/fishrc

2014-07-08 23:42:20 Tree
[0fe0fd] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

Make sure that the real bash is used

2014-07-08 21:59:46 Tree
[6d939f] by Bernhard F.W. Gschaider Bernhard F.W. Gschaider

First proof-of-concept of a 'one script for all'

2014-07-08 20:09:54 Tree
[a65bfe] by Hrvoje Jasak Hrvoje Jasak

Formatting and grammar

2014-07-04 17:23:43 Tree
[9274b0] by Hrvoje Jasak Hrvoje Jasak

Merge branch 'bugfix/updatePreconfiguredBoundaryTuts' into nextRelease

2014-07-04 16:35:29 Tree
[681f91] by Hrvoje Jasak Hrvoje Jasak

Draft for next release notes

2014-06-19 18:54:41 Tree
[27c125] (bugfix/updatePreconfiguredBoundaryTuts) by Hrvoje Jasak Hrvoje Jasak

Update broked preconfigured boundary files for mixing plane

2014-06-19 18:42:23 Tree
[ff55be] by Hrvoje Jasak Hrvoje Jasak

Merge branch 'nextRelease' of ssh://git.code.sf.net/p/openfoam-extend/foam-extend-3.1 into nextRelease

2014-06-19 08:49:30 Tree
[addfa4] by Hrvoje Jasak Hrvoje Jasak

Making zero directories for cfMesh

2014-06-19 08:49:18 Tree
[34e29b] by Henrik Rusche Henrik Rusche

Merge branch 'bugfix/releaseNotes' into nextRelease

2014-06-18 07:41:44 Tree
[256114] by Hrvoje Jasak Hrvoje Jasak

Merge branch 'cfMeshMacPortChanges' into nextRelease

Conflicts:
Allwmake.firstInstall

2014-06-17 11:26:01 Tree
[44123a] by Hrvoje Jasak Hrvoje Jasak

CLang porting changes: cfMesh

2014-06-17 10:42:41 Tree
[b973a1] by Henrik Rusche Henrik Rusche

Merge commit '10725e9' into nextRelease

Conflicts:
ListOfContributors

2014-06-17 10:01:30 Tree
[bf0df9] by Hakan Nilsson Hakan Nilsson

Same modifications as just done in master

2014-06-16 21:11:42 Tree
[c37054] by Dominik Christ Dominik Christ

Added bazaar packages

2014-06-16 16:00:21 Tree
[8d5634] by Dominik Christ Dominik Christ

Commented out ulimit in etc/bashrc

2014-06-16 15:58:22 Tree
[3d469c] by Henrik Rusche Henrik Rusche

Merge branch 'nextRelease-3.2' into nextRelease

Conflicts:
ListOfContributors

2014-06-16 14:50:20 Tree
[10725e] (nextRelease-3.2) by Henrik Rusche Henrik Rusche

Moving cfMesh into place. Updated contibutors list

2014-06-11 21:13:15 Tree
[c9cabb] by Franjo Juretic Franjo Juretic , pushed by Henrik Rusche Henrik Rusche

Adding cfMesh-v1.0 into the repository

Signed-off-by: Henrik Rusche <h.rusche@...>

2014-06-10 13:43:32 Tree

Discussion

  • Bernhard Gschaider

    Hold it: just found that when etc/tcshrc is sourced from .tcshrc behaviour is different AGAIN (no $_ set). I'll have to find a workaround for that (tcsh may be nice to use but seems to be even more inconsistent to program than the other shells)

     
  • Bernhard Gschaider

    OK. There is now a workaround: setting an environment variable before the actual sourcing. This is unfortunate but there seems to be no other way that tcshrc can find out which file is being sourced when executing .tcshrc and knowing that is absolutely essential.

    The actual commit to merge is 691804627dac01

     
  • Dominik Christ

    Dominik Christ - 2015-05-14
    • Status: open --> merged
     

Log in to post a comment.