From f58dc74ce140d0de4d811627d99ac7506c23b7dc Mon Sep 17 00:00:00 2001
From: ngn <ngn@ngn.tf>
Date: Sun, 25 Aug 2024 15:03:28 +0300
Subject: [PATCH] fix: prevent wrapper packages from being empty

---
 src/awesome/pkg.sh    |  6 ++++--
 src/dialog/changes.md |  2 +-
 src/dialog/pkg.sh     | 24 ++++++++++++++----------
 src/i3/pkg.sh         | 10 +++++-----
 src/lxde/pkg.sh       |  6 ++++--
 src/xfce4/pkg.sh      |  6 ++++--
 src/xorg/pkg.sh       |  6 ++++--
 7 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/awesome/pkg.sh b/src/awesome/pkg.sh
index 02e75fd..24330b0 100644
--- a/src/awesome/pkg.sh
+++ b/src/awesome/pkg.sh
@@ -1,12 +1,14 @@
 NAME="awesome"
 DESC="Awesome window manager"
 VERSION="1"
+
 FILES=()
 HASHES=()
+
 DEPENDS=("awesomewm" "rlwrap" "vicious")
 
 PACKAGE() {
   echo This is just a wrapper package, nothing to do
-  mkdir -pv "$ROOTDIR/var/lib/wrapperpkg"
-  touch "$ROOTDIR/var/lib/wrapperpkg/mp-awesome"
+  install -dm755 "${ROOTDIR}/var/lib/wrapper_packages"
+  echo "${VERSION}" > "${ROOTDIR}/var/lib/wrapper_packages/${NAME}"
 }
diff --git a/src/dialog/changes.md b/src/dialog/changes.md
index a73403f..d297ca0 100644
--- a/src/dialog/changes.md
+++ b/src/dialog/changes.md
@@ -1,2 +1,2 @@
-# 1.3_20240101
+# 1.3-20240101
 First version
diff --git a/src/dialog/pkg.sh b/src/dialog/pkg.sh
index fca5487..66cf9e4 100644
--- a/src/dialog/pkg.sh
+++ b/src/dialog/pkg.sh
@@ -1,20 +1,24 @@
 NAME="dialog"
 DESC="Tool to display dialog boxes from shell scripts"
-VERSION="1.3_20240101"
-FILES=("https://invisible-mirror.net/archives/dialog/dialog-${VERSION/_/-}.tgz")
+VERSION="1.3-20240101"
+
+FILES=("https://invisible-mirror.net/archives/dialog/dialog-${VERSION}.tgz")
 HASHES=("9419eb52b95837312a76ccb26002c5d624fab53abde0859f1c7364179dc0ebad")
-DEPENDS=("ncurses")
+
+DEPENDS=("ncurses" "bash")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-${VERSION/_/-}.tgz
-  cd $NAME-${VERSION/_/-}
+  tar xf "${NAME}-${VERSION}.tgz"
+  cd "${NAME}-${VERSION}"
 
-  ./configure \
-    --prefix=/usr \
-    --enable-nls \
+  ./configure      \
+    --prefix=/usr  \
+    --enable-nls   \
     --with-libtool \
     --with-ncursesw
-  make && make DESTDIR="$ROOTDIR" install-full
+  make
+  make DESTDIR="${ROOTDIR}" install-full
 
-  cd .. && rm -r $NAME-${VERSION/_/-}
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/i3/pkg.sh b/src/i3/pkg.sh
index f8ccc5c..8947bba 100644
--- a/src/i3/pkg.sh
+++ b/src/i3/pkg.sh
@@ -1,14 +1,14 @@
 NAME="i3"
 DESC="i3 window manager"
 VERSION="1"
+
 FILES=()
 HASHES=()
-DEPENDS=(
-  "i3wm" "i3status" "i3blocks"
-)
+
+DEPENDS=("i3wm" "i3status" "i3blocks")
 
 PACKAGE() {
   echo This is just a wrapper package, nothing to do
-  mkdir -pv "$ROOTDIR/var/lib/wrapperpkg"
-  touch "$ROOTDIR/var/lib/wrapperpkg/mp-i3"
+  install -dm755 "${ROOTDIR}/var/lib/wrapper_packages"
+  echo "${VERSION}" > "${ROOTDIR}/var/lib/wrapper_packages/${NAME}"
 }
diff --git a/src/lxde/pkg.sh b/src/lxde/pkg.sh
index 6a6980e..16b63b9 100644
--- a/src/lxde/pkg.sh
+++ b/src/lxde/pkg.sh
@@ -1,8 +1,10 @@
 NAME="lxde"
 DESC="LXDE desktop enviroment"
 VERSION="1"
+
 FILES=()
 HASHES=()
+
 DEPENDS=(  
   "lxmenu-data" "libfm-extra" "menu-cache"
   "libfm" "pcmanfm" "libwnck2" "lxpanel"
@@ -14,6 +16,6 @@ DEPENDS=(
 
 PACKAGE() {
   echo This is just a wrapper package, nothing to do
-  mkdir -pv "$ROOTDIR/var/lib/wrapperpkg"
-  touch "$ROOTDIR/var/lib/wrapperpkg/mp-lxde"
+  install -dm755 "${ROOTDIR}/var/lib/wrapper_packages"
+  echo "${VERSION}" > "${ROOTDIR}/var/lib/wrapper_packages/${NAME}"
 }
diff --git a/src/xfce4/pkg.sh b/src/xfce4/pkg.sh
index 0f78ae9..4404f1c 100644
--- a/src/xfce4/pkg.sh
+++ b/src/xfce4/pkg.sh
@@ -1,8 +1,10 @@
 NAME="xfce4"
 DESC="XFCE4 desktop enviroment"
 VERSION="1"
+
 FILES=()
 HASHES=()
+
 DEPENDS=(
   "libxfce4util" "xfconf" "libxfce4ui"
   "exo" "garcon" "xfce4-panel"
@@ -16,6 +18,6 @@ DEPENDS=(
 
 PACKAGE() {
   echo This is just a wrapper package, nothing to do
-  mkdir -pv "$ROOTDIR/var/lib/wrapperpkg"
-  touch "$ROOTDIR/var/lib/wrapperpkg/mp-xfce4"
+  install -dm755 "${ROOTDIR}/var/lib/wrapper_packages"
+  echo "${VERSION}" > "${ROOTDIR}/var/lib/wrapper_packages/${NAME}"
 }
diff --git a/src/xorg/pkg.sh b/src/xorg/pkg.sh
index 44af7a1..1f347be 100644
--- a/src/xorg/pkg.sh
+++ b/src/xorg/pkg.sh
@@ -1,8 +1,10 @@
 NAME="xorg"
 DESC="All required packages to get XORG up and running"
 VERSION="1"
+
 FILES=()
 HASHES=()
+
 DEPENDS=(
   "libdrm" "fonts" "libxmu" "libxrandr" "libxrender" "libxslt" "libxt"
   "libxtst" "libxshmfence" "mtdev" "libxinerama" "libxcb" "libxau" "libxaw"
@@ -16,6 +18,6 @@ DEPENDS=(
 
 PACKAGE() {
   echo This is just a wrapper package, nothing to do
-  mkdir -pv "$ROOTDIR/var/lib/wrapperpkg"
-  touch "$ROOTDIR/var/lib/wrapperpkg/mp-xorg"
+  install -dm755 "${ROOTDIR}/var/lib/wrapper_packages"
+  echo "${VERSION}" > "${ROOTDIR}/var/lib/wrapper_packages/${NAME}"
 }