build(Makefile): make cleanup more failure-resistant

Makefile

@@ -52,18 +52,20 @@ help:
 	utils/makehelp.pl Makefile ; \
 	fi
 
-.PHONY: clean%
+.PHONY: clean
 # HELP: remove all compilation results in the directory but leave containers and images unharmed
 clean:
-	rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known
-	rm -rf .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
-	rm -rf bin/ .Dockerfile develop/
+	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known || :
+	-rm -rf .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc || :
+	-rm -rf bin .Dockerfile develop || :
+.PHONY: clean-all
 # HELP: like clean but with container and image prune
-clean-all: clean
-	rm -rf .stack 
-	$(CONTAINER_COMMAND) system prune --all --force --volumes
-	$(CONTAINER_COMMAND) image prune --all --force
-	$(CONTAINER_COMMAND) volume prune --force
+clean-all:
+	$(MAKE) clean
+	-rm -rf .stack || :
+	-$(CONTAINER_COMMAND) system prune --all --force --volumes
+	-$(CONTAINER_COMMAND) image prune --all --force
+	-$(CONTAINER_COMMAND) volume prune --force
 
 .PHONY: release
 # HELP: create, commit and push a new release

clean.sh

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
-
-if [[ -n "${1}" ]]; then
-    target=".stack-work-${1}"
-else
-    target=".stack-work"
-fi
-shift
-
-if [[ ! -d "${target}" ]]; then
-    printf "%s does not exist or is no directory\n" "${target}" >&2
-    exit 1
-fi
-
-if [[ "${target}" != ".stack-work" ]]; then
-  if [[ -e .stack-work-clean ]]; then
-      printf ".stack-work-clean exists\n" >&2
-      exit 1
-  fi
-
-  move-back() {
-      if [[ -d .stack-work ]]; then
-          mv -vT .stack-work "${target}"
-      else
-          mkdir -v "${target}"
-      fi
-      [[ -d .stack-work-clean ]] && mv -vT .stack-work-clean .stack-work
-  }
-
-  mv -vT .stack-work .stack-work-clean
-  mv -vT "${target}" .stack-work
-  trap move-back EXIT
-fi
-
-(
-    set -ex
-    stack clean $@
-)

hoogle.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-stack --work-dir .stack-work-doc --jobs 4 hoogle -- ${@:-server --local --port $HOOGLE_PORT}

is-clean.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-[[ -n "${FORCE_RELEASE}" ]] && exit 0
-
-set -e
-
-if [ -n "$(git status --porcelain)" ]; then
-    echo "Working directory isn't clean" >&2
-    exit 1
-fi
-
-branch="$(git rev-parse --abbrev-ref HEAD)"
-
-if [[ $branch != "master" && $branch != "test" ]]; then
-    echo "Not on master or test" >&2
-    exit 1
-fi
-
-ourHash=$(git rev-parse HEAD)
-theirHash=$(git ls-remote origin -h refs/heads/$branch | awk '{ print $1; }')
-
-if [ "$theirHash" != "$ourHash" ]; then
-    echo "Local HEAD is not up to date with remote $branch" >&2
-    exit 1
-fi