Browse Source

fix submodule head detaching

pull/1/head
Marek Piasecki 6 years ago
parent
commit
de5b515f40
  1. 6
      README.md
  2. 8
      pro

6
README.md

@ -23,7 +23,7 @@ Next, tell git to download `pro-framework`:
```sh
git submodule init
git submodule update
./pro update
```
#### Setup and run
@ -31,7 +31,7 @@ git submodule update
Pro uses [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/install) (version >= 1.9.0 recommended). Be sure you have it installed and working beforehand.
```sh
./pro s
./pro start
```
Visit [http://localhost:3000](http://localhost:3000)
@ -42,7 +42,7 @@ and
```
git pull pro-template master
git submodule update
./pro update
```
### Example app ###

8
pro

@ -1,2 +1,8 @@
#!/bin/bash
./framework/tools/containers/docker/start.sh $@
if [ "$1" == 'update' -o "$1" == 'u' ]; then
git submodule update
git submodule foreach git checkout master
git submodule foreach git pull origin master
else
./framework/tools/containers/docker/start.sh $@
fi

Loading…
Cancel
Save