Update LICENSE

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 CapCreeperGR
+Copyright (c) 2024 EnumDev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -21,7 +21,7 @@ Creating a package for BPM with these utilities is simple
 
 2) Run the following command (You can run the comamnd with no arguments to see available options)
 ```
-bpm-setup -D my_bpm_package -t <binary/source>
+bpm-setup -D my_package -t <binary/source>
 ```
 3) This will create a directory named 'my_bpm_package' under the current directory with all the required files for the chosen package type
 4) You are able to edit the pkg.info descriptor file inside the newly created directory to your liking. Here's an example of what a descriptor  file could look like
@@ -29,12 +29,14 @@ bpm-setup -D my_bpm_package -t <binary/source>
 name: my_package
 description: My package's description
 version: 1.0
+revision: 2 (Optional)
 architecture: x86_64
 url: https://www.my-website.com/ (Optional)
 license: MyLicense (Optional)
 type: <binary/source>
-depends: dependency1,dependency2 (Optional)
+depends: ["dependency1","dependency2"] (Optional)
-make_depends: make_depend1,make_depend2 (Optional)
+optional_depends: ["optional_depend1","optional_depend2"]
+make_depends: ["make_depend1","make_depend2"] (Optional)
 ```
 ### Binary Packages
 3) If you are making a binary package, copy all your binaries along with the directories they reside in (i.e files/usr/bin/my_binary)

bpm-convert

@@ -6,11 +6,12 @@ fi
 
 echo "$ARCH"
 
-while getopts "ksa:" o; do
+while getopts "ksfa:" o; do
     case "${o}" in
         a) ARCH="$OPTARG";;
         k) KEEP=true;;
         s) SKIPCHECK=true;;
+        f) FORCE=true;;
         *) exit 1;;
     esac
 done
@@ -26,7 +27,7 @@ if ! [ -f "$PACKAGE" ]; then
   echo "$PACKAGE is not a path to a file"
   exit 1
 fi
-if ! file "$PACKAGE" | grep -q 'gzip compressed data'; then
+if ! file "$PACKAGE" | grep -q 'POSIX tar archive'; then
   echo "$PACKAGE is not a BPM package"
   exit 1
 fi
@@ -61,6 +62,44 @@ function ReadPkgInfo() {
 }
 ReadPkgInfo
 
+if [ -z "$FORCE" ] && command -v bpm &> /dev/null && [ -n "$PKGINFO[depends]" ]; then
+  MISSING=()
+  for depend in $(echo "${PKGINFO[depends]}" | tr -d '[]' | tr ',' '\n' ); do
+    if ! bpm info "$depend" &> /dev/null; then
+      MISSING+=("$depend")
+    fi
+  done
+  if [ "${#MISSING[@]}" -ne 0 ]; then
+    echo "The following dependencies could not be resolved: ${MISSING[@]}"
+    EXIT=true
+  fi
+elif ! command -v bpm &> /dev/null; then
+  echo "BPM not in PATH. Skipping dependency resolution"
+elif [ -n "$FORCE" ]; then
+  echo "Force compilation enabled. Skipping dependency resolution"
+fi
+
+if [ -z "$FORCE" ] && command -v bpm &> /dev/null && [ -n "$PKGINFO[make_depends]" ]; then
+  MISSING=()
+  for depend in $(echo "${PKGINFO[make_depends]}" | tr -d '[]' | tr ',' '\n' ); do
+    if ! bpm info "$depend" &> /dev/null; then
+      MISSING+=("$depend")
+    fi
+  done
+  if [ "${#MISSING[@]}" -ne 0 ]; then
+    echo "The following make dependencies could not be resolved: ${MISSING[@]}"
+    EXIT=true
+  fi
+elif ! command -v bpm &> /dev/null; then
+  echo "BPM not in PATH. Skipping make dependency resolution"
+elif [ -n "$FORCE" ]; then
+  echo "Force compilation enabled. Skipping make dependency resolution"
+fi
+
+if [ -n "$EXIT" ]; then
+  exit 1
+fi
+
 # Creating temporary compilation directory structure
 TEMPDIR="/var/tmp/bpm_source_${PKGINFO[name]}"
 if [ -d "$TEMPDIR" ] && [ -z "$KEEP" ]; then
@@ -68,13 +107,18 @@ if [ -d "$TEMPDIR" ] && [ -z "$KEEP" ]; then
 fi
 mkdir -p "$TEMPDIR"
 mkdir -p "$TEMPDIR"/source
+[ -d "$TEMPDIR"/output ] && rm -rf "$TEMPDIR"/output
 mkdir -p "$TEMPDIR"/output
 tar -xf "$PACKAGE" -C "$TEMPDIR" source.sh
 if tar -xf "$PACKAGE" -C "$TEMPDIR" source-files &> /dev/null; then
   mv "$TEMPDIR"/source-files/* "$TEMPDIR"/
   rm -d "$TEMPDIR"/source-files
 fi
-
+PACKAGE_SCRIPTS=()
+while read line; do
+  PACKAGE_SCRIPTS+=("$line")
+done < <(tar -tf "$PACKAGE" | grep -v -E 'source.sh|pkg.info|source-files')
+tar -xf "$PACKAGE" -C "$TEMPDIR" ${PACKAGE_SCRIPTS[@]} &> /dev/null
 cd "$TEMPDIR"
 
 # Declare and run Set Variables function
@@ -82,6 +126,8 @@ function SetVariables() {
   export BPM_PKG_NAME="${PKGINFO[name]}"
   export BPM_PKG_DESC="${PKGINFO[description]}"
   export BPM_PKG_VERSION="${PKGINFO[version]}"
+  export BPM_PKG_REVISION="${PKGINFO[revision]}"
+  [ -z "$BPM_PKG_REVISION" ] && export BPM_PKG_REVISION=1
   export BPM_PKG_URL="${PKGINFO[url]}"
   export BPM_PKG_ARCH="${PKGINFO[architecture]}"
   IFS=',' read -r -a BPM_PKG_DEPENDS <<< "${PKGINFO[depends]}"
@@ -156,8 +202,9 @@ for func in $(typeset -F | awk '{print $3}' | grep '^package'); do
   echo "${PKGINFO_FILE}" > pkg.info
   sed -i "s/architecture:.*/architecture: ${ARCH}/g" pkg.info
   sed -i 's/type:.*/type: binary/g' pkg.info
-  fakeroot -i "$TEMPDIR"/fakeroot_file_"$pkgname" tar -czpf "$pkgname".tar.gz pkg.info output --transform 's/output/files/'
+  fakeroot -i "$TEMPDIR"/fakeroot_file_"$pkgname" find "$TEMPDIR"/output -mindepth 1 -printf "%P %#m %U %G %s\n" > "$TEMPDIR"/pkg.files
-  mv "$pkgname".tar.gz "$DIR"/"$pkgname"-"$BPM_PKG_VERSION"-"$ARCH".bpm
+  find output -printf "%P\n" | fakeroot -i "$TEMPDIR"/fakeroot_file_"$pkgname" tar -czf files.tar.gz --no-recursion -C output -T -
+  tar -cf "$DIR"/"$pkgname"-"$BPM_PKG_VERSION"-"$BPM_PKG_REVISION"-"$ARCH".bpm --owner=0 --group=0 -C "$TEMPDIR" pkg.info pkg.files ${PACKAGE_SCRIPTS[@]} files.tar.gz
   echo "Packaged ${pkgname} successfully!"
   rm "$TEMPDIR"/fakeroot_file_"$pkgname"
   rm -r output/

bpm-package

@@ -1,27 +1,33 @@
 #!/bin/bash
-if [ $# -eq 0 ]
-then
-  echo "No output package name given!"
-  exit 1
-fi
 
 if [ -f .compilation-options ]; then
   source ./.compilation-options
 fi
 
-while getopts "cska:" flag; do
+while getopts "cskfa:" flag; do
   case "$flag" in
     c) CONVERT=true;;
     k) KEEP=true;;
     s) SKIPCHECK=true;;
+    f) FORCE=true;;
     a) ARCH="${OPTARG}";;
     *) exit 1;;
   esac
 done
 
-output="${@:$OPTIND:1}"
+if [ -f pkg.info ]; then
+  echo "pkg.info file found"
+else
+  echo "pkg.info file not found in $PWD"
+  exit 1
+fi
 
-if [[ ! "$output" =~ ^[a-z.A-Z0-9_-]{1,}$ ]]; then
+output="${@:$OPTIND:1}"
+if [ -z "$output" ]; then
+  pkgname=$(grep "^name: " pkg.info)
+  output=$(echo "$pkgname" | cut -d' ' -f2)"-src.bpm"
+fi
+if [ -z "$output" ] || [[ ! "$output" =~ ^[a-z.A-Z0-9_-]{1,}$ ]]; then
   echo "Invalid output name! The name must only contain letters, numbers, hyphens or underscores!"
   exit 1
 fi
@@ -55,6 +61,10 @@ else
       echo "post_install.sh file found"
       toCompress+=("post_install.sh")
     fi
+    if [ -f pre_remove.sh ]; then
+      echo "pre_remove.sh file found"
+      toCompress+=("pre_remove.sh")
+    fi
     if [ -f post_remove.sh ]; then
       echo "post_remove.sh file found"
       toCompress+=("post_remove.sh")
@@ -71,13 +81,6 @@ else
   fi
 fi
 
-if [ -f pkg.info ]; then
-  echo "pkg.info file found"
-else
-  echo "pkg.info file not found in $PWD"
-  exit 1
-fi
-
 for pkginfo in ./pkg.inf*; do
   pkginfo=$(basename "$pkginfo")
   echo "${pkginfo} file found"
@@ -85,15 +88,12 @@ for pkginfo in ./pkg.inf*; do
 done
 
 echo "Creating $type package as $output"
-tar -c --owner=0 --group=0 --no-same-owner -zf "$output" "${toCompress[@]}"
+tar -c --owner=0 --group=0 --no-same-owner -f "$output" "${toCompress[@]}"
 
 if [ ! -z "$CONVERT" ] && "$CONVERT" && [[ "$type" == "source" ]]; then
   args=()
-  if ! [ -z "$KEEP" ]; then
+  [ -n "$KEEP" ] && args+=("-k")
-    args+=("-a" "$ARCH")
+  [ -n "$SKIPCHECK" ] && args+=("-s")
-  fi
+  [ -n "$FORCE" ] && args+=("-f")
-  if ! [ -z "$SKIPCHECK" ]; then
-    args+=("-s")
-  fi
   bpm-convert "${args[@]}" -a "$ARCH" "$output"
 fi

bpm-setup

@@ -19,7 +19,6 @@ if [ $# -eq 0 ]; then
   exit
 fi
 
-NAME="package-name"
 DESCRIPTION="Default package description"
 VERSION="1.0"
 #URL="https://my.project.url/ (Optional)"
@@ -79,6 +78,10 @@ if [ -z "${DIRECTORY}" ]; then
   exit 1
 fi
 
+if [ -z "${NAME}" ]; then
+  NAME="${DIRECTORY}"
+fi
+
 if [[ ! "${DIRECTORY}" == "/"* ]]; then
   DIRECTORY="${PWD}/${DIRECTORY}"
 fi

create-repository-data

@@ -17,7 +17,7 @@ while getopts "d" flag; do
     case "$flag" in
         d) DEEP=true
            shopt -s globstar;;
-        *) echo "Unknown flag ${flag}"
+        *) >&2 echo "Unknown flag ${flag}"
            exit 2;;
     esac
 done
@@ -27,7 +27,7 @@ if [ -z "${@:$OPTIND:1}" ]; then
   exit 1
 fi
 if ! [ -d "${@:$OPTIND:1}" ]; then
-  echo "The given path is not a directory"
+  >&2 echo "The given path is not a directory"
   exit 1
 fi
 
@@ -37,36 +37,44 @@ fi
 
 shopt -s nullglob
 
-if ! $DEEP; then
+create_entry() {
-  for arch in "$REPO"/*/; do
+  if [ $# -eq 0 ]; then
-    for pkg in "$arch"/*.bpm; do
+    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 ! echo "$info" | grep -q '^  type: binary'; then
+    >&2 echo "The following package is not a binary package: ${package}"
+    exit 1
+  fi
   if containsElement "$package" "${PKGS[@]}"; then
-        echo "The following package was found in more than 1 package archives: ${package}"
+    >&2 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'"download_size: "$(cat "$pkg" | wc -c)
+  info+=$'\n'"installed_size: "$(tar -xf "$pkg" files.tar.gz -O | zcat | wc -c)
   info+=$'\n---'
   echo "$info"
+}
+
+if ! $DEEP; then
+  for arch in "$REPO"/*/; do
+    for pkg in "$arch"/*.bpm; do
+      create_entry "$pkg"
     done
   done
 else
   for arch in "$REPO"/*/; do
     for pkg in "$arch"/**/*.bpm; do
-      info=$(tar -xf "$pkg" pkg.info -O)
+      create_entry "$pkg"
-      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"
     done
   done
 fi