From a7ae13efb77f33f645f4faa2143cf1431393aef0 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sat, 8 Jul 2023 20:11:09 +0200
Subject: [PATCH] Fix cache invalidation on commit update

---
 scripts.d/20-libiconv.sh   | 3 +--
 scripts.d/45-pulseaudio.sh | 3 +--
 scripts.d/50-davs2.sh      | 3 +--
 scripts.d/50-gme.sh        | 3 +--
 scripts.d/50-svtav1.sh     | 3 +--
 scripts.d/50-uavs3d.sh     | 3 +--
 scripts.d/50-x265.sh       | 3 +--
 scripts.d/50-xavs2.sh      | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index ebadb7d..f6d09f7 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\""
-    to_df "RUN git -C $SELF checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\" && git -C $SELF checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index e4d5761..356b6be 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index 8a3e778..1e4cd15 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -12,8 +12,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 015cfae..e580cd4 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 5ec307c..66b6600 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index c6d4573..38e56bd 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 0e026de..14bc515 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index ffcde84..36b1e65 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -12,8 +12,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
 }
 
 ffbuild_dockerbuild() {