From 2aca7df72145d55a26423d9c8389a544a61e28db Mon Sep 17 00:00:00 2001 From: jackun Date: Thu, 13 Aug 2020 18:28:16 +0300 Subject: [PATCH] Revert "[build.sh] Utilize `ninja uninstall`" This reverts commit a16a5fd9076d288c0f131e802c29d458e31b71c9. --- build.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index b2c44a7d..fc97ca85 100755 --- a/build.sh +++ b/build.sh @@ -183,15 +183,14 @@ release() { uninstall() { [ "$UID" -eq 0 ] || exec $SU_CMD bash "$0" uninstall - - ninja -C build/meson32 uninstall - ninja -C build/meson64 uninstall - - # Historic garbage rm -rfv "/usr/lib/mangohud" + rm -rfv "/usr/share/doc/mangohud" + rm -fv "/usr/share/man/man1/mangohud.1" rm -fv "/usr/share/vulkan/implicit_layer.d/mangohud.json" + rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.json" rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json" rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json" + rm -fv "/usr/bin/mangohud" rm -fv "/usr/bin/mangohud.x86" } @@ -203,9 +202,9 @@ install() { [ "$UID" -eq 0 ] || build [ "$UID" -eq 0 ] || exec $SU_CMD bash "$0" install - uninstall >/dev/null - ninja -C build/meson32 install - ninja -C build/meson64 install + uninstall + $SU_CMD ninja -C build/meson32 install + $SU_CMD ninja -C build/meson64 install # FIXME get the triplet somehow ln -sv lib /usr/lib/mangohud/lib64