From 3ea431b98df48827f3ede5f7e33b77270e580c46 Mon Sep 17 00:00:00 2001 From: CapCreeperGR Date: Thu, 30 May 2024 15:55:47 +0300 Subject: [PATCH] Added '-a ' flag to to bpm-package --- bpm-convert | 8 ++++++-- bpm-package | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bpm-convert b/bpm-convert index 1d8a810..57477c7 100755 --- a/bpm-convert +++ b/bpm-convert @@ -1,6 +1,10 @@ #!/bin/bash DIR="$PWD" +ARCH="$2" +if [ -z "$ARCH" ]; then + ARCH=$(uname -m) +fi if ! [ -f "$1" ]; then echo "$1 is not a path to a file" @@ -92,10 +96,10 @@ cd "$BPM_WORKDIR" mv output/ files/ touch pkg.info echo "${PKGINFO_FILE}" > pkg.info -sed -i "s/architecture:.*/architecture: $(uname -m)/g" pkg.info +sed -i "s/architecture:.*/architecture: ${ARCH}/g" pkg.info sed -i 's/type:.*/type: binary/g' pkg.info tar -czpf "$BPM_PKG_NAME".tar.gz files pkg.info -mv "$BPM_PKG_NAME".tar.gz "$DIR"/"$BPM_PKG_NAME"-"$(uname -m)".bpm +mv "$BPM_PKG_NAME".tar.gz "$DIR"/"$BPM_PKG_NAME"-"$ARCH".bpm echo "Package conversion complete!" rm -rf "$TEMPDIR" root diff --git a/bpm-package b/bpm-package index 40c086b..d342770 100755 --- a/bpm-package +++ b/bpm-package @@ -5,9 +5,10 @@ then exit 1 fi -while getopts "c" flag; do +while getopts "ca:" flag; do case "$flag" in c) CONVERT=true;; + a) ARCHITECTURE="${OPTARG}";; *) exit 1;; esac done @@ -75,6 +76,6 @@ echo "Creating $type package as $output" tar -czf "$output" "${toCompress[@]}" -if "$CONVERT" && [[ "$type" == "source" ]]; then - bpm-convert "$output" +if [ ! -z "$CONVERT" ] && "$CONVERT" && [[ "$type" == "source" ]]; then + bpm-convert "$output" "$ARCHITECTURE" fi