From 7f9aaf46422b2b9918749ca5b6bbba2f4717a2f6 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Thu, 19 Sep 2013 11:27:47 -0400 Subject: [PATCH] Submodule fixes. [UPDATED] InAppSettingsKit now uses the lhunath repo. [UPDATED] Fix to updating submodule repo URLs in updateDependencies. [UPDATED] Minor fix to PearlEmail. --- .gitmodules | 2 +- External/Pearl | 2 +- Scripts/updateDependencies | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index bccf3f8b..c5aaf4ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = git://github.com/Lyndir/Pearl.git [submodule "External/InAppSettingsKit"] path = External/InAppSettingsKit - url = git://github.com/futuretap/InAppSettingsKit.git + url = git://github.com/lhunath/InAppSettingsKit.git [submodule "External/FontReplacer"] path = External/FontReplacer url = git://github.com/0xced/FontReplacer.git diff --git a/External/Pearl b/External/Pearl index 836df986..130845b1 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 836df9864b37f3802d66c1f02a5609d9b4a8e10a +Subproject commit 130845b1224237d913997db4dca946b15e69aa7c diff --git a/Scripts/updateDependencies b/Scripts/updateDependencies index dea0a3f7..6619c31d 100755 --- a/Scripts/updateDependencies +++ b/Scripts/updateDependencies @@ -19,6 +19,9 @@ isCheckedOut() { ! 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 for dependency in "${dependencies[@]}"; do @@ -29,8 +32,6 @@ done # 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