From d488fb570358e13a31e5c172f3d74bb75d71348e Mon Sep 17 00:00:00 2001 From: Martin Kennedy Date: Tue, 24 May 2022 17:11:33 -0400 Subject: [PATCH] fix: cleanup a logically incorrect && ... || shell sequence If one of the other &&s had failed other than the last one, we'd have descended into the OR here. --- openwrt-builder-commit.dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openwrt-builder-commit.dockerfile b/openwrt-builder-commit.dockerfile index f559f78..06b6851 100644 --- a/openwrt-builder-commit.dockerfile +++ b/openwrt-builder-commit.dockerfile @@ -9,9 +9,7 @@ ARG commit="master" RUN cd ${openwrt_dir} \ && ( git remote add ${remote} ${remoteurl} --tags || true ) -RUN cd ${openwrt_dir} \ - && git fetch --all \ - && git checkout ${remote}/${commit} || git checkout "${commit}" +RUN cd ${openwrt_dir} && git fetch --all && { git checkout ${remote}/${commit} || git checkout "${commit}" ; } RUN cd ${openwrt_dir} \ && ./scripts/feeds update -a \