From 936511ae63a9311ab048207452fa02ca52847c3c Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott <ian@iandouglasscott.com> Date: Mon, 12 Jun 2017 08:41:22 -0700 Subject: [PATCH] Actually, don't rely on recipe being commited to git --- repo.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/repo.sh b/repo.sh index 25b5ad469..588c4477c 100755 --- a/repo.sh +++ b/repo.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -e +shopt -s nullglob source config.sh @@ -39,8 +40,8 @@ do else TIME_BUILD="$(find recipes/$recipe/build -type f -not -path '*/.git*' -printf "%Ts\n" | sort -nr | head -n 1)" TIME_STAGE="$(stat -c "%Y" recipes/$recipe/stage.tar)" - TIME_RECIPE="$(find $(git ls-tree -r --name-only HEAD recipes/$recipe) -printf '%Ts\n' | sort -nr | head -n 1)" - if [ "$TIME_BUILD" -gt "$TIME_STAGE" -o "$TIME_RECIPE" -gt "$TIME_STAGE" ] + TIME_RECIPE="$(find recipes/$recipe/{recipe.sh,*.patch} -printf '%Ts\n' | sort -nr | head -n 1)" + if [ "$TIME_BUILD" -gt "$TIME_STAGE" -o "$TIME_RECIPE" -gt "$TIME_STAGE" ] then echo -e "\033[01;38;5;155mrepo - rebuilding $recipe\033[0m" >&2 ./cook.sh "$recipe" untar unstage update build stage tar -- GitLab