From 9fbf79c0453952ed48f9ed31f7004aab73c92e8e Mon Sep 17 00:00:00 2001
From: Guy Harris <gharris@sonic.net>
Date: Wed, 16 Dec 2020 18:14:30 -0800
Subject: [PATCH] macos-setup: various cleanups.

In uninstall_autoconf, when running uninstall subfunctions, pass the
arguments to the subfunctions.

When uninstalling Ninja, remove the "we've finished installing this"
indicator file.

Get rid of a debugging "set +x".
---
 tools/macos-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh
index 98c7c42d87..a15486c8d2 100755
--- a/tools/macos-setup.sh
+++ b/tools/macos-setup.sh
@@ -376,8 +376,8 @@ uninstall_autoconf() {
         #
         # automake and libtool depend on this, so uninstall them.
         #
-        uninstall_libtool
-        uninstall_automake
+        uninstall_libtool "$@"
+        uninstall_automake "$@"
 
         echo "Uninstalling GNU autoconf:"
         cd autoconf-$installed_autoconf_version
@@ -496,6 +496,7 @@ uninstall_ninja() {
     if [ ! -z "$installed_ninja_version" ]; then
         echo "Uninstalling Ninja:"
         sudo rm /usr/local/bin/ninja
+        rm ninja-$installed_ninja_version-done
         if [ "$#" -eq 1 -a "$1" = "-r" ] ; then
             rm -f ninja-mac-v$installed_ninja_version.zip
         fi
@@ -807,7 +808,6 @@ set -x
         $DO_MAKE_INSTALL || exit 1
         cd ..
         touch glib-$GLIB_VERSION-done
-set +x
     fi
 }