Added -g flag to bpm-setup for automatic git repository initialization

source.default now uses the new PKGBUILD-like structure
bpm-package now accepts a '-c' flag that creates an additional binary package from a source package
bpm-convert creates a binary package from a source package

README.md

@@ -12,7 +12,9 @@ BPM Utils is a package providing a number of different helper scripts for settin
 
 ## Installation
 
-Currently all BPM Utilities are simple bash scripts. This means you are able to simply clone this repository and place these scripts wherever you would like. Additionally pre-made packages are available for the following Linux distributions:
+Currently all BPM Utilities are simple bash scripts. This means you are able to simply clone this repository and place these scripts wherever you would like. Additionally pre-made packages are available for the following package managers: \
+BPM: https://gitlab.com/bubble-package-manager/bpm-utils-bpm \
+Pacman: https://gitlab.com/bubble-package-manager/bpm-utils-pacman
 
 ## Package Creation using BPM Utils
 
@@ -46,7 +48,7 @@ bpm-package <filename.bpm>
 3) If you would like to bundle patches or other files with your source package place them in the 'source-files' directory. They will be extracted to the same location as the source.sh file during compilation
 4) You need to edit your 'source.sh' file, the default source.sh template should explain the basic process of compiling your program
 5) Your goal is to download your program's source code with either git, wget, curl, etc. and put the binaries under a folder called 'output' in the root of the temp directory. There is a simple example script with helpful comments in the htop-src test package
-6) When you are done making your source.sh script run the following to create a package archive
+6) When you are done making your source.sh script run the following to create a package archive. You may also append the -c flag to compile the package and create a binary package as well
 ```
 bpm-package <filename.bpm>
 ```

bpm-convert

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+while getopts "ksa:" o; do
+    case "${o}" in
+        a) ARCH="$OPTARG";;
+        k) KEEP=true;;
+        s) SKIPCHECK=true;;
+        *) exit 1;;
+    esac
+done
+
+PACKAGE="${@:$OPTIND:1}"
+
+DIR="$PWD"
+if [ -z "$ARCH" ]; then
+  ARCH=$(uname -m)
+fi
+
+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
+  echo "$PACKAGE is not a BPM package"
+  exit 1
+fi
+if ! tar -tf "$PACKAGE" | grep -q 'source.sh'; then
+  echo "$PACKAGE is not a BPM source package"
+  exit 1
+fi
+echo "$Converting $PACKAGE..."
+
+PKGINFO_FILE=$(tar -axf "$PACKAGE" pkg.info -O)
+declare -A PKGINFO
+while read line; do
+  PKGINFO[$(echo -n "$line" | cut -d":" -f1 | xargs)]=$(echo -n "$line" | cut -d":" -f2 | xargs)
+done < <(tar -axf "$PACKAGE" pkg.info -O)
+
+TEMPDIR="/var/tmp/bpm_source_${PKGINFO[name]}"
+if [ -d "$TEMPDIR" ] && [ -z "$KEEP" ]; then
+  rm -rf "$TEMPDIR"
+fi
+mkdir -p "$TEMPDIR"
+mkdir -p "$TEMPDIR"/source
+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
+
+cd "$TEMPDIR"
+
+export BPM_PKG_NAME="${PKGINFO[name]}"
+export BPM_PKG_DESC="${PKGINFO[description]}"
+export BPM_PKG_VERSION="${PKGINFO[version]}"
+export BPM_PKG_URL="${PKGINFO[url]}"
+export BPM_PKG_ARCH="${PKGINFO[architecture]}"
+IFS=',' read -r -a BPM_PKG_DEPENDS <<< "${PKGINFO[depends]}"
+IFS=',' read -r -a BPM_PKG_MAKE_DEPENDS <<< "${PKGINFO[make_depends]}"
+export BPM_PKG_DEPENDS
+export BPM_PKG_MAKE_DEPENDS
+export BPM_WORKDIR="$TEMPDIR"
+export BPM_SOURCE="$TEMPDIR"/source
+export BPM_OUTPUT="$TEMPDIR"/output
+
+set -a
+source source.sh
+set +a
+
+if [[ $(type -t prepare) == function ]]; then
+  echo "Running prepare() function..."
+  bash -e -c prepare
+  if [ $? -ne 0 ]; then
+    echo "Failed to run prepare() function in source.sh"
+    exit 1
+  fi
+fi
+cd "$BPM_SOURCE"
+if [[ $(type -t build) == function ]]; then
+  echo "Running build() function..."
+  bash -e -c build
+  if [ $? -ne 0 ]; then
+    echo "Failed to run build() function in source.sh"
+    exit 1
+  fi
+fi
+cd "$BPM_SOURCE"
+if [[ $(type -t check) == function ]] && [ -z "$SKIPCHECK" ]; then
+  echo "Running check() function..."
+  check
+  if [ $? -ne 0 ]; then
+    echo "Failed to run check() function in source.sh"
+    exit 1
+  fi
+fi
+cd "$BPM_SOURCE"
+if ! [[ $(type -t package) == function ]]; then
+  echo "Failed to locate package() function in source.sh"
+  exit 1
+fi
+echo "Running package() function..."
+touch "$TEMPDIR"/fakeroot_file
+fakeroot -s "$TEMPDIR"/fakeroot_file bash -e -c package
+if [ $? -ne 0 ]; then
+  echo "Failed to run package() function in source.sh"
+  exit 1
+fi
+cd "$BPM_WORKDIR"
+touch pkg.info
+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 -s "$TEMPDIR"/fakeroot_file tar -czpf "$BPM_PKG_NAME".tar.gz pkg.info output --transform 's/output/files/'
+mv "$BPM_PKG_NAME".tar.gz "$DIR"/"$BPM_PKG_NAME"-"$BPM_PKG_VERSION"-"$ARCH".bpm
+echo "Package conversion complete!"
+
+if [ -z "$KEEP" ]; then
+  rm -rf "$TEMPDIR"
+fi

bpm-package

@@ -5,7 +5,17 @@ then
   exit 1
 fi
 
-output=$1
+while getopts "cska:" flag; do
+  case "$flag" in
+    c) CONVERT=true;;
+    k) KEEP=true;;
+    s) SKIPCHECK=true;;
+    a) ARCHITECTURE="${OPTARG}";;
+    *) exit 1;;
+  esac
+done
+
+output="${@:$OPTIND:1}"
 
 if [[ ! "$output" =~ ^[a-z.A-Z0-9_-]{1,}$ ]]; then
   echo "Invalid output name! The name must only contain letters, numbers, hyphens or underscores!"
@@ -65,5 +75,15 @@ else
 fi
 
 echo "Creating $type package as $output"
+tar -c --owner=0 --group=0 --no-same-owner -zf "$output" "${toCompress[@]}"
 
-tar -czf "$output" "${toCompress[@]}"
+if [ ! -z "$CONVERT" ] && "$CONVERT" && [[ "$type" == "source" ]]; then
+  args=()
+  if ! [ -z "$KEEP" ]; then
+    args+=("-a" "$ARCHITECTURE")
+  fi
+  if ! [ -z "$SKIPCHECK" ]; then
+    args+=("-s")
+  fi
+  bpm-convert "${args[@]}" -a "$ARCHITECTURE"  "$output"
+fi

bpm-setup

@@ -11,6 +11,7 @@ usage () {
   echo "bpm-setup -l <licenses> | Set the package licenses (Optional)"
   echo "bpm-setup -t <binary/source> | Set the package type to binary or source (Defaults to binary)"
   echo "bpm-setup -s <source template file> | Use a default template file (Defaults to /etc/bpm-utils/source.default)"
+  echo "bpm-setup -g <true/false> | Create git repository (Defaults to true)"
 }
 
 if [ $# -eq 0 ]; then
@@ -25,8 +26,9 @@ VERSION="1.0"
 #LICENSE="Your project's license (Optional)"
 TYPE="binary"
 SOURCE_FILE="/etc/bpm-utils/source.default"
+GIT=true
 
-while getopts "D:n:d:v:u:l:t:s:y" o; do
+while getopts "D:n:d:v:u:l:t:s:g:y" o; do
   case "${o}" in
     D)
       DIRECTORY="${OPTARG}"
@@ -55,6 +57,16 @@ while getopts "D:n:d:v:u:l:t:s:y" o; do
     s)
       SOURCE_FILE="$(realpath ${OPTARG})"
       ;;
+    g)
+      if [[ "${OPTARG}" == true ]]; then
+        GIT=TRUE
+      elif [[ "${OPTARG}" == false ]]; then
+        GIT=false
+      else
+        echo "${OPTARG} is not a true or false value!"
+        exit 1
+      fi
+      ;;
     *)
       usage
       exit 1
@@ -99,6 +111,9 @@ if [ -z "${CONFIRM}" ]; then
   fi
   
   echo "Package type: $TYPE"
+  if [[ "$TYPE" == "source" ]]; then
+    echo "Create Git repository: $GIT"
+  fi
   read -p "Create package directory? [y/N]: " CREATE
   case $CREATE in
     [Yy]* )
@@ -146,6 +161,10 @@ else
     echo "Source file at ${SOURCE_FILE} does not exist! Creating empty source.sh instead..."
     touch source.sh
   fi
+  if $GIT ; then
+    git init
+    echo -e "*.bpm\n.gitignore" > .gitignore
+  fi
   echo "Package directory created successfully!"
   echo "Make sure to edit the pkg.info file with the appropriate information for your package"
   echo "Add your compilation code in the source.sh file. Follow the instructions on the template file on how to properly create your compilation script"

source.default

@@ -1,24 +1,32 @@
 # This is the source.sh script. It is executed by BPM in a temporary directory when compiling a source package
-# BPM expects there to be an 'output' directory under the root of the temporary directory after this script finishes executing, otherwise your program may not be correctly installed
-# It is recommended you create the 'output' directory along with a 'source' directory in the root of the temporary directory like this
-echo "Compiling ${NAME}..."
-# Creating SOURCE and OUTPUT variables
-SOURCE="$(pwd)"/source
-OUTPUT="$(pwd)"/output
-# Creating the 'source' and 'output' directories
-mkdir "$SOURCE"
-mkdir "$OUTPUT"
-# Creating DOWNLOAD and FILENAME variables
-DOWNLOAD="https://www.my-url.com/file.tar.gz"
+# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
+# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
+
+DOWNLOAD="https://wwww.my-url.com/file.tar.gz"
 FILENAME="${DOWNLOAD##*/}"
-# Downloading files
+
+# The prepare function is executed in the root of the temp directory
+# This function is used for downloading files and putting them into the correct location
+prepare() {
   wget "$DOWNLOAD"
-# Extracting archive into 'source'
-tar -xvf "$FILENAME" --strip-components=1 -C "$SOURCE"
-# Changing directory into 'source'
-cd "$SOURCE"
-# Configuring and compiling ${NAME}
+  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
+}
+
+# The build function is executed in the source directory
+# This function is used to compile the source code
+build() {
   ./configure --prefix=/usr
   make
-make install DESTDIR="$OUTPUT"
-echo "${NAME} compilation complete!"
+}
+
+# The check function is executed in the source directory
+# This function is used to run tests to verify the package has been compiled correctly
+check() {
+  make check
+}
+
+# The package function is executed in the source directory
+# This function is used to move the compiled files into the output directory
+package() {
+  make DESTDIR="$BPM_OUTPUT" install
+}