~ubuntu-branches/ubuntu/hardy/xxdiff/hardy

« back to all changes in this revision

Viewing changes to test/dir2/file1

  • Committer: Bazaar Package Importer
  • Author(s): Tomas Pospisek
  • Date: 2005-03-29 08:43:56 UTC
  • mfrom: (1.2.1 upstream) (2.1.2 hoary)
  • Revision ID: james.westby@ubuntu.com-20050329084356-nkwv8jf18nc7u5qf
Tags: 1:3.1-3
re-upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/bin/bash  #-- not used anyhow
2
2
#
3
 
# $Id: file1,v 1.1.1.1 2000/09/15 02:19:36 blais Exp $
 
3
# $Id: file1,v 1.2 2003/12/27 07:22:06 blais Exp $
4
4
#
5
5
 
6
6
# echo "Bashrc executed"
14
14
 
15
15
if [ -f "$HOME/.cache.bashenv" ]; then
16
16
    # echo "Resetting environment in .bashrc"
17
 
    . $HOME/conf/.env.pre
18
 
    . $HOME/conf/.env.scopes
19
 
    . $HOME/conf/.env.post
 
17
    . $HOME/the-config/.env.pre
 
18
    . $HOME/the-config/.env.scopes
 
19
    . $HOME/the-config/.env.post
20
20
fi
21
21
 
22
22
# check for cache first
31
31
    #---------------------------------------------------------------------------
32
32
    # source scope-specific bashrc's
33
33
    
34
 
    if [ -f $HOME/conf/share/.bashrc.local ]; then
35
 
        . $HOME/conf/share/.bashrc.local
36
 
    fi
37
 
    
38
 
    if [ -f $HOME/conf/site/$SITE/.bashrc.local ]; then
39
 
        . $HOME/conf/site/$SITE/.bashrc.local
40
 
    fi
41
 
    
42
 
    if [ -f $HOME/conf/plat/$PLAT/.bashrc.local ]; then
43
 
        . $HOME/conf/plat/$PLAT/.bashrc.local
44
 
    fi
45
 
    
46
 
    if [ -f $HOME/conf/host/$HOST/.bashrc.local ]; then
47
 
        . $HOME/conf/host/$HOST/.bashrc.local
48
 
    fi
49
 
    
50
 
    if [ -f $HOME/conf/site/$SITE/plat/$PLAT/.bashrc.local ]; then
51
 
        . $HOME/conf/site/$SITE/plat/$PLAT/.bashrc.local
52
 
    fi
53
 
    
54
 
    if [ -f $HOME/conf/host/$HOST/plat/$PLAT/.bashrc.local ]; then
55
 
        . $HOME/conf/host/$HOST/plat/$PLAT/.bashrc.local
 
34
    if [ -f $HOME/the-config/share/.bashrc.local ]; then
 
35
        . $HOME/the-config/share/.bashrc.local
 
36
    fi
 
37
    
 
38
    if [ -f $HOME/the-config/site/$SITE/.bashrc.local ]; then
 
39
        . $HOME/the-config/site/$SITE/.bashrc.local
 
40
    fi
 
41
    
 
42
    if [ -f $HOME/the-config/plat/$PLAT/.bashrc.local ]; then
 
43
        . $HOME/the-config/plat/$PLAT/.bashrc.local
 
44
    fi
 
45
    
 
46
    if [ -f $HOME/the-config/host/$HOST/.bashrc.local ]; then
 
47
        . $HOME/the-config/host/$HOST/.bashrc.local
 
48
    fi
 
49
    
 
50
    if [ -f $HOME/the-config/site/$SITE/plat/$PLAT/.bashrc.local ]; then
 
51
        . $HOME/the-config/site/$SITE/plat/$PLAT/.bashrc.local
 
52
    fi
 
53
    
 
54
    if [ -f $HOME/the-config/host/$HOST/plat/$PLAT/.bashrc.local ]; then
 
55
        . $HOME/the-config/host/$HOST/plat/$PLAT/.bashrc.local
56
56
    fi
57
57
fi