Fix: xbps: hoarder and trashman installs

4 files changed, 43 insertions, 11 deletions

diff --git a/share/hoarder/xbps/unix/linux/debian/install b/share/hoarder/xbps/unix/linux/debian/install
index 4652ad1..a6fc256 100755
--- a/share/hoarder/xbps/unix/linux/debian/install
+++ b/share/hoarder/xbps/unix/linux/debian/install
@@ -2,6 +2,7 @@
 #
 # Install XBPS package manager.
 #
+
 # Parameters
 SHARE="$1"
 LIB="$2"
@@ -19,11 +20,11 @@ trashman_apt_install make gcc zlib1g-dev pkg-config libarchive-dev graphviz doxy
 mkdir -p $HOME/.local/src
 
 # Build and install
-git clone https://github.com/void-linux/xbps $HOME/.local/src/xbps || exit 1
-cd $HOME/.local/src/xbps                                           || exit 1
-./configure --enable-rpath --prefix=/usr --sysconfdir=/etc         || exit 1
-make -j$(nproc)                                                    || exit 1
-make DESTDIR=$DESTDIR install clean                                || exit 1
+git clone https://github.com/void-linux/xbps $HOME/.local/src/xbps     || exit 1
+cd $HOME/.local/src/xbps                                               || exit 1
+./configure --enable-rpath --prefix=$DESTDIR --sysconfdir=$DESTDIR/etc || exit 1
+make -j$(nproc)                                                        || exit 1
+make DESTDIR=$DESTDIR install clean                                    || exit 1
 
 # Remove source
 #rm -rf $HOME/.local/src/xbps
diff --git a/share/trashman/trashman/unix/install b/share/trashman/trashman/unix/install
index 7e09911..f8825af 100755
--- a/share/trashman/trashman/unix/install
+++ b/share/trashman/trashman/unix/install
@@ -6,7 +6,7 @@
 # Parameters
 SHARE="$1"
 BASE="$SHARE/../.."
-FOLDER="/usr/local"
+DESTDIR="/usr/local"
 
 # Include basic functions
 . $SHARE/trashman/functions || exit 1
@@ -18,14 +18,14 @@ if ! which rsync > /dev/null 2>&1; then
 fi
 
 # Ensure folders exists and we have their absolute names
-FOLDER="`mkdir -p $FOLDER && cd $FOLDER > /dev/null && pwd`"
+DESTDIR="`mkdir -p $DESTDIR && cd $DESTDIR > /dev/null && pwd`"
 BASE="`cd $BASE > /dev/null && pwd`"
 
 # Install if we're not already running the system-wide version
-if [ "$BASE" != "$FOLDER" ]; then
-  rsync -av --delete $BASE/ $FOLDER/share/trashman/ || exit 1
+if [ "$BASE" != "$DESTDIR" ]; then
+  rsync -av --delete $BASE/ $DESTDIR/share/trashman/ || exit 1
 fi
 
 # Create symlink
-( cd $FOLDER/bin && ln -sf $FOLDER/share/trashman/trashman ) || exit 1
-( cd $FOLDER/bin && ln -sf $FOLDER/share/trashman/hoarder  ) || exit 1
+( cd $DESTDIR/bin && ln -sf $DESTDIR/share/trashman/trashman ) || exit 1
+( cd $DESTDIR/bin && ln -sf $DESTDIR/share/trashman/hoarder  ) || exit 1
diff --git a/share/trashman/xbps/info b/share/trashman/xbps/info
new file mode 100644
index 0000000..50a56ed
--- /dev/null
+++ b/share/trashman/xbps/info
@@ -0,0 +1 @@
+X Binary Package System designed and implemented from scratch
diff --git a/share/trashman/xbps/unix/linux/debian/install b/share/trashman/xbps/unix/linux/debian/install
new file mode 100755
index 0000000..dfc4423
--- /dev/null
+++ b/share/trashman/xbps/unix/linux/debian/install
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+#
+# Install XBPS package manager.
+#
+
+# Parameters
+SHARE="$1"
+BASE="$SHARE/../.."
+DESTDIR="/usr/local"
+
+# Include basic functions
+. $SHARE/trashman/functions || exit 1
+. $SHARE/trashman/debian    || exit 1
+
+# Requirements
+trashman_apt_install make gcc zlib1g-dev pkg-config libarchive-dev graphviz doxygen
+#trashman_apt_install atf-sh
+
+# Source folder
+mkdir -p $DESTDIR/src
+
+# Build and install
+git clone https://github.com/void-linux/xbps $DESTDIR/src/xbps         || exit 1
+cd $HOME/.local/src/xbps                                               || exit 1
+./configure --enable-rpath --prefix=$DESTDIR --sysconfdir=$DESTDIR/etc || exit 1
+make -j$(nproc)                                                        || exit 1
+make DESTDIR=$DESTDIR install clean                                    || exit 1
+
+# Remove source
+#rm -rf $HOME/.local/src/xbps