Browse Source

bump framework and change submodules pulling strategy

pull/1/head
Marek Piasecki 6 years ago
parent
commit
6660a78238
  1. 2
      README.md
  2. 2
      framework
  3. 4
      pro

2
README.md

@ -22,7 +22,7 @@ git push -u origin master
Next, tell git to download `pro-framework`:
```sh
git submodule init
git pull --recurse-submodules
./pro update
```

2
framework

@ -1 +1 @@
Subproject commit a1620787f45814231de07bd9bafcd04a56389ec4
Subproject commit 8d61daf5974d1c438b70c2d6513fa6f19db4999e

4
pro

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

Loading…
Cancel
Save