From c2de62c343140e72fdfc7a406f20d227a4204a17 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Sat, 14 Sep 2024 14:24:37 +0000
Subject: [PATCH] Fixed 'deep' repository data creation not using the updated
 database format

---
 create-repository-data | 46 ++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/create-repository-data b/create-repository-data
index f554aa1..08629ac 100755
--- a/create-repository-data
+++ b/create-repository-data
@@ -37,36 +37,38 @@ fi
 
 shopt -s nullglob
 
+create_entry() {
+  if [ $# -eq 0 ]; then
+    return 0
+  fi
+  if ! [ -f "$1" ]; then
+    return 0
+  fi
+  
+  info="info:"$'\n'
+  info+=$(tar -xf "$pkg" pkg.info -O | sed 's/^/  /g')
+  package=$(echo "$info" | grep 'name: ' | xargs | awk '{print $2}')
+  if containsElement "$package" "${PKGS[@]}"; then
+    echo "The following package was found in more than 1 package archives: ${package}"
+    exit 1
+  fi
+  PKGS+=("$package")
+  file="$(realpath -s --relative-to="$REPO" "$pkg")"
+  info+=$'\n'"download: ${file}"
+  info+=$'\n---'
+  echo "$info"
+}
+
 if ! $DEEP; then
   for arch in "$REPO"/*/; do
     for pkg in "$arch"/*.bpm; do
-      info="info:"$'\n'
-      info+=$(tar -xf "$pkg" pkg.info -O | sed 's/^/  /g')
-      package=$(echo "$info" | grep 'name: ' | xargs | awk '{print $2}')
-      if containsElement "$package" "${PKGS[@]}"; then
-        echo "The following package was found in more than 1 package archives: ${package}"
-        exit 1
-      fi
-      PKGS+=("$package")
-      file="$(realpath -s --relative-to="$REPO" "$pkg")"
-      info+=$'\n'"download: ${file}"
-      info+=$'\n---'
-      echo "$info"
+      create_entry "$pkg"
     done
   done
 else
   for arch in "$REPO"/*/; do
     for pkg in "$arch"/**/*.bpm; do
-      info=$(tar -xf "$pkg" pkg.info -O)
-      package=$(echo "$info" | grep 'name: ' | awk '{print $2}')
-      if [[ ${PKGS[@]} =~ "$package" ]]; then
-        echo "The following package was found in more than 1 package archives: ${package}"
-      fi
-      PKGS+=("$package")
-      file="$(realpath -s --relative-to="$REPO" "$pkg")"
-      info+=$'\n'"file: ${file}"
-      info+=$'\n---'
-      echo "$info"
+      create_entry "$pkg"
     done
   done
 fi