/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
42
42
        if [ ! -f ~/.stdhomerc ]; then
43
43
                echo "No ~/.stdhomerc, creating..."
44
44
                echo "[stdhome]" >> ~/.stdhomerc
45
 
                echo "#home-dir = ~/tmp/stdhome-test" >> ~/.stdhomerc
46
 
                mkdir -p ~/tmp/stdhome-test
 
45
                echo "#home-dir = ~/tmp/stdhome-dev" >> ~/.stdhomerc
 
46
                mkdir -p ~/tmp/stdhome-dev
47
47
        fi
48
 
        if ! grep -q '^#home-dir ?= ?~/tmp/stdhome-test' ~/.stdhomerc; then
 
48
        if ! grep -q '^#home-dir ?= ?~/tmp/stdhome-dev' ~/.stdhomerc; then
49
49
                echo "No commented home-dir in ~/.stdhomerc"
50
50
                echo "Please add the following to the [stdhome] section:"
51
 
                echo "#home-dir = ~/tmp/stdhome-test"
 
51
                echo "#home-dir = ~/tmp/stdhome-dev"
52
52
                exit 1
53
53
        fi
54
54
 
61
61
                echo new dev environment, use stdhome init
62
62
        fi
63
63
        sed -ie 's/^#\(home-dir\)/\1/' ~/.stdhomerc
64
 
        mkdir -p ~/tmp/stdhome-test
 
64
        mkdir -p ~/tmp/stdhome-dev
65
65
 
66
66
elif [ "$TARGET" == "off" ]; then
67
67
 
73
73
        echo turning off
74
74
 
75
75
        # check rc
76
 
        if ! grep -q '^home-dir ?= ?~/tmp/stdhome-test' ~/.stdhomerc; then
 
76
        if ! grep -q '^home-dir ?= ?~/tmp/stdhome-dev' ~/.stdhomerc; then
77
77
                echo "No uncommented home-dir in ~/.stdhomerc"
78
78
                exit 1
79
79
        fi