/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to tools/dev

  • Committer: Tim Marston
  • Date: 2016-04-10 20:17:32 UTC
  • Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9
added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/dev
5
5
        mkdir ~/.stdhome
6
6
fi
7
7
if [ ! -d ~/.stdhome ]; then
8
 
        echo "ERROR: can't determine current state: no ~/.stdhome"
 
8
        echo "Can't determine current state: no ~/.stdhome"
9
9
        exit 1
10
10
fi
11
11
 
17
17
        CURRENT=off
18
18
fi
19
19
if [ -z "$CURRENT" ]; then
20
 
        echo "ERROR: can't determine current state" >&2
 
20
        echo "Can't determine current state" >&2
21
21
        exit 1
22
22
fi
23
23
 
40
40
 
41
41
        # create/check rc
42
42
        if [ ! -f ~/.stdhomerc ]; then
43
 
                echo "ERROR: no ~/.stdhomerc, creating..."
 
43
                echo "No ~/.stdhomerc, creating..."
44
44
                echo "[stdhome]" >> ~/.stdhomerc
45
45
                echo "#home-dir = ~/tmp/stdhome-dev" >> ~/.stdhomerc
46
46
                mkdir -p ~/tmp/stdhome-dev
47
47
        fi
48
 
        if ! grep -q '^#home-dir \?= \?~/tmp/stdhome-dev' ~/.stdhomerc; then
49
 
                echo "ERROR: no commented home-dir in ~/.stdhomerc"
 
48
        if ! grep -q '^#home-dir ?= ?~/tmp/stdhome-dev' ~/.stdhomerc; then
 
49
                echo "No commented home-dir in ~/.stdhomerc"
50
50
                echo "Please add the following to the [stdhome] section:"
51
51
                echo "#home-dir = ~/tmp/stdhome-dev"
52
52
                exit 1
62
62
        fi
63
63
        sed -ie 's/^#\(home-dir\)/\1/' ~/.stdhomerc
64
64
        mkdir -p ~/tmp/stdhome-dev
65
 
        DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
66
 
        ln -s "$DIR"/src/stdhome ~/bin/stdhome
67
65
 
68
66
elif [ "$TARGET" == "off" ]; then
69
67
 
75
73
        echo turning off
76
74
 
77
75
        # check rc
78
 
        if ! grep -q '^home-dir \?= \?~/tmp/stdhome-dev' ~/.stdhomerc; then
79
 
                echo "ERROR: no uncommented home-dir in ~/.stdhomerc"
 
76
        if ! grep -q '^home-dir ?= ?~/tmp/stdhome-dev' ~/.stdhomerc; then
 
77
                echo "No uncommented home-dir in ~/.stdhomerc"
80
78
                exit 1
81
79
        fi
82
80
 
84
82
        mv ~/.stdhome{,.dev}
85
83
        mv ~/.stdhome{.orig,}
86
84
        sed -ie 's/^home-dir/#\0/' ~/.stdhomerc
87
 
        rm -f ~/bin/stdhome
88
85
 
89
86
else
90
87
        echo currently $CURRENT