2
0

Merge branch 'master' of github.com:Lyndir/MasterPassword

This commit is contained in:
Maarten Billemont 2013-09-21 10:44:04 -04:00
commit cf64ce96f2
2 changed files with 4 additions and 3 deletions

2
.gitmodules vendored
View File

@ -3,7 +3,7 @@
url = git://github.com/Lyndir/Pearl.git url = git://github.com/Lyndir/Pearl.git
[submodule "External/InAppSettingsKit"] [submodule "External/InAppSettingsKit"]
path = External/InAppSettingsKit path = External/InAppSettingsKit
url = git://github.com/futuretap/InAppSettingsKit.git url = git://github.com/lhunath/InAppSettingsKit.git
[submodule "External/FontReplacer"] [submodule "External/FontReplacer"]
path = External/FontReplacer path = External/FontReplacer
url = git://github.com/0xced/FontReplacer.git url = git://github.com/0xced/FontReplacer.git

View File

@ -19,6 +19,9 @@ isCheckedOut() {
! git submodule status | grep -q "^-[^ ]* $modulePath" ! git submodule status | grep -q "^-[^ ]* $modulePath"
} }
# git submodule sync -- A bug causes this to init ALL external dependencies.
git submodule sync $(git submodule status | awk '/^ / { print $2 }')
# Check out our missing dependencies # Check out our missing dependencies
for dependency in "${dependencies[@]}"; do for dependency in "${dependencies[@]}"; do
@ -29,8 +32,6 @@ done
# Update our modules # Update our modules
# git submodule sync -- A bug causes this to init ALL external dependencies.
git submodule sync $(git submodule status | awk '/^ / { print $2 }')
git submodule update git submodule update