From 1965ee382b91488ac59a4a1ab68b191c6f3f5ed6 Mon Sep 17 00:00:00 2001 From: Botspot Date: Sun, 15 Aug 2021 21:02:14 -0500 Subject: [PATCH] FreeCAD: use pkg-install --- apps/FreeCAD/install-32 | 6 +----- apps/FreeCAD/uninstall | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/FreeCAD/install-32 b/apps/FreeCAD/install-32 index 91ffec9..255524f 100755 --- a/apps/FreeCAD/install-32 +++ b/apps/FreeCAD/install-32 @@ -7,15 +7,11 @@ function error { exit 1 } -#ensure uninstalled already -sudo apt purge -y freecad || error "apt failed to purge the freecad package!" - -#remove file ahead of time, just in case it exists rm -f ~/freecad.deb #download file wget -O ~/freecad.deb https://github.com/chunky-milk/freecad-rpi/releases/download/v0.19.2/freecad_0.19.2_armhf.deb || error "Failed to download freecad.deb" #install freecad -sudo apt install -y --fix-broken ~/freecad.deb || error "apt failed to install freecad.deb" +"${DIRECTORY}/pkg-install" "$HOME/freecad.deb" "$(dirname "$0")" || error "apt failed to install freecad.deb" rm -f ~/freecad.deb diff --git a/apps/FreeCAD/uninstall b/apps/FreeCAD/uninstall index c6d20a7..46bc224 100755 --- a/apps/FreeCAD/uninstall +++ b/apps/FreeCAD/uninstall @@ -7,4 +7,4 @@ function error { exit 1 } -sudo apt purge -y freecad || error "apt failed to purge the freecad package!" +"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1