From 16590dbb0269936c8bad93c007eaf39c48e3289f Mon Sep 17 00:00:00 2001
From: apio <blobs.trading@gmail.com>
Date: Tue, 8 Aug 2023 17:43:27 +0200
Subject: [PATCH] ports: Avoid using two separate directories for port packages

---
 .gitignore                 |  1 -
 tools/install-package.sh   | 11 ++---------
 tools/uninstall-package.sh |  1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63e1ac90..e1e4353d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ base/usr/**
 .fakeroot
 kernel/config.cmake
 ports/out/
-ports/local/
 ports/temp/
diff --git a/tools/install-package.sh b/tools/install-package.sh
index 556213e2..f87c8265 100755
--- a/tools/install-package.sh
+++ b/tools/install-package.sh
@@ -15,11 +15,6 @@ fi
 
 source ports/$PORT_NAME/PACKAGE
 
-if [ -f ports/local/$name-$version.tar.gz ]; then
-    echo "Package $PORT_NAME is already installed and up to date!"
-    exit 1
-fi
-
 if ! [ -f ports/out/$name-$version.tar.gz ]; then
     tools/make-package.sh $PORT_NAME
 fi
@@ -28,19 +23,17 @@ PORT_FILES=$LUNA_BASE/usr/share/pkgdb/$PORT_NAME.files
 
 if [ -f $PORT_FILES ]
 then
-    echo "Package $PORT_NAME is installed, but is an outdated version. Updating."
+    echo "Package $PORT_NAME is already installed! Updating."
     tools/uninstall-package.sh $PORT_NAME
 fi
 
-cp ports/out/$name-$version.tar.gz ports/local/
-
 mkdir -p $LUNA_BASE/usr/share/pkgdb/
 
 cd $LUNA_BASE
 
 find -type f | sed 's|^./||'  > /tmp/before.list
 
-tar -C $LUNA_BASE -xf $LUNA_ROOT/ports/local/$name-$version.tar.gz
+tar -C $LUNA_BASE -xf $LUNA_ROOT/ports/out/$name-$version.tar.gz
 
 find -type f | sed 's|^./||' > /tmp/after.list
 
diff --git a/tools/uninstall-package.sh b/tools/uninstall-package.sh
index e9dad2fb..e347d4f5 100755
--- a/tools/uninstall-package.sh
+++ b/tools/uninstall-package.sh
@@ -16,4 +16,3 @@ fi
 
 rm -v $(cat $LUNA_BASE/usr/share/pkgdb/$PORT_NAME.files)
 rm -v $LUNA_BASE/usr/share/pkgdb/$PORT_NAME.files
-rm -v $LUNA_ROOT/ports/local/$PORT_NAME-*.tar.gz