From 9a4bbcd930afa54bc605e3020fb38353161e5a84 Mon Sep 17 00:00:00 2001 From: romkatv Date: Tue, 26 May 2020 08:37:25 +0200 Subject: Squashed 'gitstatus/' changes from 0127fd26a..cc956ca78 cc956ca78 interrupt p10k instant prompt before printing "gitstatus failed to initialize" error db3603bc8 improve "gitstatus failed to initialize" error message e164594ea work around bugs in cygwin 55af96ade cleanup + todo 0e70dbc56 add an empty line before the error message git-subtree-dir: gitstatus git-subtree-split: cc956ca7878ef6d00bb1f35861864d0a40ffac75 --- build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build b/build index 25dbb5e9..2cb63f74 100755 --- a/build +++ b/build @@ -56,9 +56,12 @@ appname=gitstatusd-"$gitstatus_kernel"-"$gitstatus_arch" libgit2_tmp="$outdir"/deps/"$appname".libgit2.tmp cleanup() { - cd / - command rm -rf -- "$workdir" "$outdir"/usrbin/"$appname".tmp "$libgit2_tmp" trap - INT QUIT TERM ILL PIPE + cd / + if ! command rm -rf -- "$workdir" "$outdir"/usrbin/"$appname".tmp "$libgit2_tmp"; then + command sleep 5 + command rm -rf -- "$workdir" "$outdir"/usrbin/"$appname".tmp "$libgit2_tmp" + fi } trap cleanup INT QUIT TERM ILL PIPE -- cgit v1.2.3