From 86fad4773e3a3855bdfe860744249167d4bb1c88 Mon Sep 17 00:00:00 2001 From: l3iggs Date: Tue, 19 Aug 2014 11:09:25 -0700 Subject: [PATCH] test for presence of .git folders for pull/clone To decide between doing a git clone or a git pull, test for the existence of the .git folder inside the target destination, not just the existence of the target folder itself. This allows for a peaceful coexistance between libretro_fetch.sh and git submodules to come. --- libretro-fetch.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libretro-fetch.sh b/libretro-fetch.sh index ae629497..4e5bd6e1 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -6,7 +6,7 @@ fetch_project_bsnes() { echo "=== Fetching $3 ===" - if [ -d "$2" ]; then + if [ -d "$2/.git" ]; then cd "$2" git pull cd .. @@ -17,7 +17,7 @@ fetch_project_bsnes() if [ -d "$2" ]; then cd "$2" - if [ -d "perf" ]; then + if [ -d "perf/.git" ]; then cd perf git pull .. cd .. @@ -25,7 +25,7 @@ fetch_project_bsnes() git clone . perf fi - if [ -d "balanced" ]; then + if [ -d "balanced/.git" ]; then cd balanced git pull .. cd .. @@ -40,7 +40,7 @@ fetch_project_bsnes() fetch_project() { echo "=== Fetching $3 ===" - if [ -d "$2" ]; then + if [ -d "$2/.git" ]; then cd "$2" git pull cd .. @@ -54,7 +54,7 @@ fetch_subproject() { echo "=== Fetching $4 ===" cd "$2" - if [ -d "$3" ]; then + if [ -d "$3/.git" ]; then cd "$3" git pull cd .. @@ -70,7 +70,7 @@ fetch_subprojects() echo "=== Fetching $5 ===" cd "$2" cd "$3" - if [ -d "$4" ]; then + if [ -d "$4/.git" ]; then cd "$4" git pull cd .. @@ -85,7 +85,7 @@ fetch_subprojects() fetch_project_submodule() { echo "=== Fetching $3 ===" - if [ -d "$2" ]; then + if [ -d "$2/.git" ]; then cd "$2" git pull cd ..