Cleaner if statement

apertus-open-source-cinema · Feb 27, 2019 · f2db345 · f2db345
1 parent f20e4dd
commit f2db345
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,13 +6,14 @@ docker_builder:
       DEVICE: beta
       DEVICE: micro
   clone_script: >
-    if [ "$CIRRUS_PR" != "" ]; then
+    if [[ -z "$CIRRUS_PR" ]]; then
       git clone --recursive --branch=$CIRRUS_BRANCH https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git $CIRRUS_WORKING_DIR
+      git reset --hard $CIRRUS_CHANGE_IN_REPO
     else
       git clone --recursive https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git $CIRRUS_WORKING_DIR
       git fetch origin pull/$CIRRUS_PR/head:pull/$CIRRUS_PR
+      git reset --hard $CIRRUS_CHANGE_IN_REPO
     fi
-    git reset --hard $CIRRUS_CHANGE_IN_REPO
   make_script: ./makefiles/docker-make.sh DEVICE=$DEVICE
   test_script: ./makefiles/docker-make.sh DEVICE=$DEVICE test
   release_script: >