From 362af48613c370ec10cedda4bf97df0b9323ad95 Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Thu, 11 May 2017 20:53:21 -0600 Subject: [PATCH] Ignore git directory, move fetch logic into seperate file --- fetch.sh | 16 ++++++++++++++++ repo.sh | 8 +------- 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100755 fetch.sh diff --git a/fetch.sh b/fetch.sh new file mode 100755 index 000000000..a1f111092 --- /dev/null +++ b/fetch.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e + +source config.sh + +if [ $# = 0 ] +then + recipes="$(ls -1 recipes)" +else + recipes="$@" +fi + +for recipe in $recipes +do + echo -e "\033[01;38;5;215mfetch - fetching $recipe\033[0m" >&2 + ./cook.sh "$recipe" fetch +done diff --git a/repo.sh b/repo.sh index 0c94fd7b0..5c042fdf3 100755 --- a/repo.sh +++ b/repo.sh @@ -11,18 +11,12 @@ fi for recipe in $recipes do - if [ ! -d "recipes/$recipe/source" ] - then - echo -e "\033[01;38;5;215mrepo - fetching and updating $recipe\033[0m" >&2 - ./cook.sh "$recipe" fetch - fi - if [ ! -f "recipes/$recipe/stage.tar" ] then echo -e "\033[01;38;5;215mrepo - building $recipe\033[0m" >&2 ./cook.sh $recipe update build stage tar else - TIME_SOURCE="$(find recipes/$recipe/source -printf "%Ts\n" | sort -nr | head -n 1)" + TIME_SOURCE="$(find recipes/$recipe/source -type f -not -path '*/.git*' -printf "%Ts\n" | sort -nr | head -n 1)" TIME_STAGE="$(stat -c "%Y" recipes/$recipe/stage.tar)" if [ "$TIME_SOURCE" -ge "$TIME_STAGE" ] then -- GitLab