From 2832827f495af25937623385073f0167a8b56312 Mon Sep 17 00:00:00 2001 From: Tai Lee Date: Wed, 17 Jun 2020 15:53:02 +1000 Subject: [PATCH] Quick fix for transcrypt when secrets are missing, while we wait for an upstream update. --- ixc_django_docker/bin/transcrypt | 2 +- ixc_django_docker/bin/transcrypt-v1-compatible | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ixc_django_docker/bin/transcrypt b/ixc_django_docker/bin/transcrypt index 7856391..4ca98b2 100755 --- a/ixc_django_docker/bin/transcrypt +++ b/ixc_django_docker/bin/transcrypt @@ -510,7 +510,7 @@ force_checkout() { cd "$REPO" || die 1 'could not change into the "%s" directory' "$REPO" IFS=$'\n' for file in $encrypted_files; do - rm "$file" + rm -f "$file" git checkout --force HEAD -- "$file" >/dev/null done unset IFS diff --git a/ixc_django_docker/bin/transcrypt-v1-compatible b/ixc_django_docker/bin/transcrypt-v1-compatible index ed89f77..48ae86c 100755 --- a/ixc_django_docker/bin/transcrypt-v1-compatible +++ b/ixc_django_docker/bin/transcrypt-v1-compatible @@ -515,7 +515,7 @@ force_checkout() { cd "$REPO" || die 1 'could not change into the "%s" directory' "$REPO" IFS=$'\n' for file in $encrypted_files; do - rm "$file" + rm -f "$file" git checkout --force HEAD -- "$file" >/dev/null done unset IFS