ci: Fix macOS and its absense of '--ignore-fail-on-non-empty' flag for rmdir

hyperupcall · hyperupcall · commit f1457715109b · 2021-07-08T23:16:36.000-07:00
diff --git a/pkg/lib/commands/do-uninstall.sh b/pkg/lib/commands/do-uninstall.sh
@@ -42,5 +42,8 @@ do_actual_uninstall() {
 	do-plumbing-unlink-completions "$package"
 
 	rm -rf "${BPM_PACKAGES_PATH:?}/$package"
-	rmdir --ignore-fail-on-non-empty "${BPM_PACKAGES_PATH:?}/${package%/*}"
+	if ! rmdir "${BPM_PACKAGES_PATH:?}/${package%/*}"; then
+		# Do not exit on failure
+		:
+	fi
 }

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,8 @@ do_actual_uninstall() {`
`42`	`42`	`do-plumbing-unlink-completions "$package"`
`43`	`43`
`44`	`44`	`rm -rf "${BPM_PACKAGES_PATH:?}/$package"`
`45`		`- rmdir --ignore-fail-on-non-empty "${BPM_PACKAGES_PATH:?}/${package%/*}"`
	`45`	`+ if ! rmdir "${BPM_PACKAGES_PATH:?}/${package%/*}"; then`
	`46`	`+ # Do not exit on failure`
	`47`	`+ :`
	`48`	`+ fi`
`46`	`49`	`}`