forked from osmocom/wireshark
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".
This commit is contained in:
parent
190442d76e
commit
9fbf79c045
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue