Added a $BPM_PKG_ARCH variable to source script

Added a "keep" field to package descriptor files which will prevent the specified files from being overwritten
Completely revamped the bpm-setup script in the bpm-utils package

bpm_utils/package_utils.go

@@ -25,6 +25,7 @@ type PackageInfo struct {
 	License     string
 	Arch        string
 	Type        string
+	Keep        []string
 	Depends     []string
 	MakeDepends []string
 	Provides    []string
@@ -203,6 +204,7 @@ func ExecutePackageScripts(filename, rootDir string, operation Operation, postOp
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_DESC=%s", pkgInfo.Description))
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_VERSION=%s", pkgInfo.Version))
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_URL=%s", pkgInfo.Url))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_ARCH=%s", pkgInfo.Arch))
 		depends := make([]string, len(pkgInfo.Depends))
 		copy(depends, pkgInfo.Depends)
 		for i := 0; i < len(depends); i++ {
@@ -269,6 +271,7 @@ func ReadPackageInfo(contents string, defaultValues bool) (*PackageInfo, error)
 		License:     "",
 		Arch:        "",
 		Type:        "",
+		Keep:        nil,
 		Depends:     nil,
 		MakeDepends: nil,
 		Provides:    nil,
@@ -308,6 +311,9 @@ func ReadPackageInfo(contents string, defaultValues bool) (*PackageInfo, error)
 			pkgInfo.Arch = split[1]
 		case "type":
 			pkgInfo.Type = split[1]
+		case "keep":
+			pkgInfo.Keep = strings.Split(strings.Replace(split[1], " ", "", -1), ",")
+			pkgInfo.Keep = stringSliceRemoveEmpty(pkgInfo.Keep)
 		case "depends":
 			pkgInfo.Depends = strings.Split(strings.Replace(split[1], " ", "", -1), ",")
 			pkgInfo.Depends = stringSliceRemoveEmpty(pkgInfo.Depends)
@@ -335,7 +341,7 @@ func ReadPackageInfo(contents string, defaultValues bool) (*PackageInfo, error)
 	return &pkgInfo, nil
 }
 
-func CreateInfoFile(pkgInfo PackageInfo) string {
+func CreateInfoFile(pkgInfo PackageInfo, keepSourceFields bool) string {
 	ret := ""
 	ret = ret + "name: " + pkgInfo.Name + "\n"
 	ret = ret + "description: " + pkgInfo.Description + "\n"
@@ -348,9 +354,15 @@ func CreateInfoFile(pkgInfo PackageInfo) string {
 	}
 	ret = ret + "architecture: " + pkgInfo.Arch + "\n"
 	ret = ret + "type: " + pkgInfo.Type + "\n"
+	if len(pkgInfo.Keep) > 0 {
+		ret = ret + "keep (" + strconv.Itoa(len(pkgInfo.Keep)) + "): " + strings.Join(pkgInfo.Keep, ",") + "\n"
+	}
 	if len(pkgInfo.Depends) > 0 {
 		ret = ret + "depends (" + strconv.Itoa(len(pkgInfo.Depends)) + "): " + strings.Join(pkgInfo.Depends, ",") + "\n"
 	}
+	if len(pkgInfo.MakeDepends) > 0 && keepSourceFields {
+		ret = ret + "make_depends (" + strconv.Itoa(len(pkgInfo.MakeDepends)) + "): " + strings.Join(pkgInfo.MakeDepends, ",") + "\n"
+	}
 	if len(pkgInfo.Provides) > 0 {
 		ret = ret + "provides (" + strconv.Itoa(len(pkgInfo.Provides)) + "): " + strings.Join(pkgInfo.Provides, ",") + "\n"
 	}
@@ -410,7 +422,8 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
 				return err
 			}
 			if strings.HasPrefix(header.Name, "files/") && header.Name != "files/" {
-				extractFilename := path.Join(installDir, strings.TrimPrefix(header.Name, "files/"))
+				trimmedName := strings.TrimPrefix(header.Name, "files/")
+				extractFilename := path.Join(installDir, trimmedName)
 				switch header.Typeflag {
 				case tar.TypeDir:
 					files = append(files, strings.TrimPrefix(header.Name, "files/"))
@@ -422,6 +435,13 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
 						fmt.Println("Creating Directory: " + extractFilename)
 					}
 				case tar.TypeReg:
+					if _, err := os.Stat(extractFilename); err == nil {
+						if slices.Contains(pkgInfo.Keep, trimmedName) {
+							fmt.Println("Skipping File: " + extractFilename + "(File is configured to be kept during installs/updates)")
+							files = append(files, trimmedName)
+							continue
+						}
+					}
 					err := os.Remove(extractFilename)
 					if err != nil && !os.IsNotExist(err) {
 						return err
@@ -571,6 +591,7 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_DESC=%s", pkgInfo.Description))
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_VERSION=%s", pkgInfo.Version))
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_URL=%s", pkgInfo.Url))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_ARCH=%s", pkgInfo.Arch))
 		depends := make([]string, len(pkgInfo.Depends))
 		copy(depends, pkgInfo.Depends)
 		for i := 0; i < len(depends); i++ {
@@ -614,6 +635,13 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
 					fmt.Println("Creating Directory: " + extractFilename)
 				}
 			} else if d.Type().IsRegular() {
+				if _, err := os.Stat(extractFilename); err == nil {
+					if slices.Contains(pkgInfo.Keep, relFilename) {
+						fmt.Println("Skipping File: " + extractFilename + "(File is configured to be kept during installs/updates)")
+						files = append(files, relFilename)
+						return nil
+					}
+				}
 				err := os.Remove(extractFilename)
 				if err != nil && !os.IsNotExist(err) {
 					return err
@@ -674,7 +702,7 @@ func InstallPackage(filename, installDir string, force, binaryPkgFromSrc, keepTe
 			compiledInfo = *pkgInfo
 			compiledInfo.Type = "binary"
 			compiledInfo.Arch = GetArch()
-			err = os.WriteFile(path.Join(compiledDir, "pkg.info"), []byte(CreateInfoFile(compiledInfo)), 0644)
+			err = os.WriteFile(path.Join(compiledDir, "pkg.info"), []byte(CreateInfoFile(compiledInfo, false)), 0644)
 			if err != nil {
 				return err
 			}
@@ -1170,6 +1198,7 @@ func RemovePackage(pkg, rootDir string) error {
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_DESC=%s", pkgInfo.Description))
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_VERSION=%s", pkgInfo.Version))
 		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_URL=%s", pkgInfo.Url))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_ARCH=%s", pkgInfo.Arch))
 		depends := make([]string, len(pkgInfo.Depends))
 		copy(depends, pkgInfo.Depends)
 		for i := 0; i < len(depends); i++ {

main.go

@@ -17,7 +17,7 @@ import (
 /*   A simple-to-use package manager  */
 /* ---------------------------------- */
 
-var bpmVer = "0.1.7"
+var bpmVer = "0.2.0"
 
 var subcommand = "help"
 var subcommandArgs []string
@@ -84,7 +84,7 @@ func resolveCommand() {
 				fmt.Printf("Package (%s) could not be found\n", pkg)
 				continue
 			}
-			fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info))
+			fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info, true))
 			if n == len(packages)-1 {
 				fmt.Println("----------------")
 			}
@@ -112,7 +112,7 @@ func resolveCommand() {
 					fmt.Printf("Package (%s) could not be found\n", pkg)
 					continue
 				}
-				fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info))
+				fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info, true))
 				if n == len(packages)-1 {
 					fmt.Println("----------------")
 				}
@@ -133,7 +133,7 @@ func resolveCommand() {
 			if err != nil {
 				log.Fatalf("Could not read package\nError: %s\n", err)
 			}
-			fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo))
+			fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo, true))
 			fmt.Println("----------------")
 			verb := "install"
 			if pkgInfo.Type == "source" {
@@ -149,14 +149,14 @@ func resolveCommand() {
 					continue
 				}
 				if pkgInfo.Type == "source" {
-					if unresolved := bpm_utils.CheckMakeDependencies(pkgInfo, rootDir); len(unresolved) != 0 {
+					if unresolved := bpm_utils.CheckMakeDependencies(pkgInfo, "/"); len(unresolved) != 0 {
 						fmt.Printf("skipping... cannot %s package (%s) due to missing make dependencies: %s\n", verb, pkgInfo.Name, strings.Join(unresolved, ", "))
 						continue
 					}
 				}
 			}
 			if rootDir != "/" {
-				fmt.Println("Warning: Installing to " + rootDir)
+				fmt.Println("Warning: Operating in " + rootDir)
 			}
 			if !yesAll {
 				reader := bufio.NewReader(os.Stdin)
@@ -231,10 +231,10 @@ func resolveCommand() {
 				fmt.Printf("Package (%s) could not be found\n", pkg)
 				continue
 			}
-			fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo))
+			fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo, true))
 			fmt.Println("----------------")
 			if rootDir != "/" {
-				fmt.Println("Warning: Installing to " + rootDir)
+				fmt.Println("Warning: Operating in " + rootDir)
 			}
 			if !yesAll {
 				reader := bufio.NewReader(os.Stdin)
@@ -305,11 +305,10 @@ func resolveCommand() {
 }
 
 func printHelp() {
-	fmt.Println("\033[1m------Help------\033[0m")
+	fmt.Println("\033[1m---- Command Format ----\033[0m")
-	fmt.Println("\033[1m\\ Command Format /\033[0m")
 	fmt.Println("-> command format: bpm <subcommand> [-flags]...")
 	fmt.Println("-> flags will be read if passed right after the subcommand otherwise they will be read as subcommand arguments")
-	fmt.Println("\033[1m\\ Command List /\033[0m")
+	fmt.Println("\033[1m---- Command List ----\033[0m")
 	fmt.Println("-> bpm version | shows information on the installed version of bpm")
 	fmt.Println("-> bpm info [-R] | shows information on an installed package")
 	fmt.Println("       -R=<root_path> lets you define the root path which will be used")

test_packages/x86_64/bpm-utils/files/usr/bin/bpm-create

@@ -1,77 +0,0 @@
-#!/bin/bash
-if [ $# -eq 0 ]
-then
-  echo "No output package name given!"
-  exit 1
-fi
-
-output=$1
-
-if [[ ! "$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
-
-type="binary"
-toCompress=("pkg.info")
-
-echo "Creating package with the name $output..."
-
-if [ -d files ]; then
-  echo "files/ directory found"
-  toCompress+=("files/")
-else
-  if [ -f source.sh ]; then
-    type="source"
-    echo "source.sh file found"
-    toCompress+=("source.sh")
-    if [ -f pre_update.sh ]; then
-      echo "pre_update.sh file found"
-      toCompress+=("pre_update.sh")
-    fi
-    if [ -f post_update.sh ]; then
-      echo "post_update.sh file found"
-      toCompress+=("post_update.sh")
-    fi
-    if [ -f pre_install.sh ]; then
-      echo "pre_install.sh file found"
-      toCompress+=("pre_install.sh")
-    fi
-    if [ -f post_install.sh ]; then
-      echo "post_install.sh file found"
-      toCompress+=("post_install.sh")
-    fi
-    if [ -f post_remove.sh ]; then
-          echo "post_remove.sh file found"
-          toCompress+=("post_remove.sh")
-        fi
-    if [ -d source-files ]; then
-      echo "source-files/ directory found"
-      toCompress+=("source-files/")
-    fi
-  else
-    echo "files/ directory or source.sh file not found in $PWD"
-    exit 1
-  fi
-fi
-
-if [ -f pkg.info ]; then
-  echo "pkg.info file found"
-else
-  echo "pkg.info file not found in $PWD"
-  exit 1
-fi
-
-echo "Creating $type package as $output"
-
-tar -czf "$output" "${toCompress[@]}"
-
-#if [[ "$type" == "binary" ]]; then
-#  tar -czf "$output" files/ pkg.info
-#else
-#  if [ -d source-files ]; then
-#    tar -czf "$output" source.sh source-files/ pkg.info
-#  else
-#    tar -czf "$output" source.sh pkg.info
-#  fi
-#fi

test_packages/x86_64/bpm-utils/files/usr/bin/bpm-setup

@@ -1,66 +1,154 @@
 #!/bin/bash
-if [ $# -lt 2 ]; then
+
-  echo "Arguments missing! Try 'bpm-setup <directory> <binary/source>'"
+usage () {
+  echo "------BPM-Setup options------"
+  echo "bpm-setup -D <directory> | Path to package directory"
+  echo "bpm-setup -y | Skips confirmation prompt"
+  echo "bpm-setup -n <name> | Set the package name (Defaults to \"package-name\")"
+  echo "bpm-setup -d <description> | Set the package description (Defaults to \"Default package description\")"
+  echo "bpm-setup -v <version> | Set the package version (Defaults to \"1.0\")"
+  echo "bpm-setup -u <url> | Set the package URL (Optional)"
+  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)"
+}
+
+if [ $# -eq 0 ]; then
+  usage
+  exit
+fi
+
+NAME="package-name"
+DESCRIPTION="Default package description"
+VERSION="1.0"
+#URL="https://my.project.url/ (Optional)"
+#LICENSE="Your project's license (Optional)"
+TYPE="binary"
+SOURCE_FILE="/etc/bpm-utils/source.default"
+
+while getopts "D:n:d:v:u:l:t:s:y" o; do
+  case "${o}" in
+    D)
+      DIRECTORY="${OPTARG}"
+      ;;
+    y)
+      CONFIRM=yes
+      ;;
+    n)
+      NAME="${OPTARG}"
+      ;;
+    d)
+      DESCRIPTION="${OPTARG}"
+      ;;
+    v)
+      VERSION="${OPTARG}"
+      ;;
+    u)
+      URL="${OPTARG}"
+      ;;
+    l)
+      LICENSE="${OPTARG}"
+      ;;
+    t)
+      TYPE="${OPTARG}"
+      ;;
+    s)
+      SOURCE_FILE="$(realpath ${OPTARG})"
+      ;;
+    *)
+      usage
+      exit 1
+      ;;
+  esac
+done
+
+if [ -z "${DIRECTORY}" ]; then
+  echo "Required directory argument missing. Try 'bpm-setup -D <directory> [other options...]"
   exit 1
 fi
 
-output=$1
+if [[ ! "${DIRECTORY}" == "/"* ]]; then
-type=$2
+  DIRECTORY="${PWD}/${DIRECTORY}"
+fi
 
-if [[ ! "$output" =~ ^[a-zA-Z0-9_-]{1,}$ ]]; then
+if [ -e "${DIRECTORY}" ]; then
-  echo "Invalid output name! The name must only contain letters, numbers, hyphens or underscores!"
+  echo "This path already exists"
   exit 1
 fi
 
-if [[ "$type" != "binary" ]] && [[ "$type" != "source" ]]; then
+if [[ "$TYPE" != "binary" ]] && [[ "$TYPE" != "source" ]]; then
   echo "Invalid package type! Package type must be either 'binary' or 'source'"
   exit 1
 fi
 
-mkdir -pv $output
-cd $output
 
-if [[ "$type" == "binary" ]]; then
+if [ -z "${CONFIRM}" ]; then
-  cat > pkg.info << EOF
+  echo "Setting up package working directory at ${DIRECTORY} with the following information:"
-name: package_name
+  echo "Package name: $NAME"
-description: Package Description
+  echo "Package description: $DESCRIPTION"
-version: 1.0
+  echo "Package version: $VERSION"
-url: your package's website/repository url. Optonal
+  if [ -z "${URL}" ]; then
-license: your package's license. Optional  
+    echo "Package URL: Not set"
-architecture: $(uname -m)
+  else
-type: binary
+    echo "Package URL: $URL"
-EOF
+  fi
+  if [ -z "${LICENSE}" ]; then
+    echo "Package license: Not set"
+  else
+    echo "Package license: $LICENSE"
+  fi
+  
+  echo "Package type: $TYPE"
+  read -p "Create package directory? [y/N]: " CREATE
+  case $CREATE in
+    [Yy]* )
+      ;;
+    *)
+      echo "Exiting bpm-setup..."
+      exit
+      ;;
+  esac
+fi
+
+if ! mkdir -pv $DIRECTORY; then
+  echo "Could not create $DIRECTORY!"
+  exit 1
+fi
+
+cd $DIRECTORY
+
+touch pkg.info
+echo "name: ${NAME}" >> pkg.info
+echo "description: ${DESCRIPTION}" >> pkg.info
+echo "version: ${VERSION}" >> pkg.info
+if [ ! -z "${URL}" ]; then echo "url: ${URL}" >> pkg.info; fi
+if [ ! -z "${LICENSE}" ]; then echo "license: ${LICENSE}" >> pkg.info; fi
+
+if [[ "$TYPE" == "binary" ]]; then
+  echo "architecture: $(uname -m)" >> pkg.info
+  echo "type: binary" >> pkg.info
   mkdir -pv files
   echo "Package directory created successfully!"
   echo "Make sure to edit the pkg.info file with the appropriate information for your package"
-  echo "Add your binaries under the files/ directory. For example a binary called 'my_binary' should go under files/usr/bin/my_binary"
+  echo "Add your binaries under the 'files' directory. For example a binary called 'my_binary' should go under files/usr/bin/my_binary"
   echo "You can turn your package into a .bpm file use the 'bpm-create <name>' command"
 else
-  cat > pkg.info << EOF
+  echo "architecture: any" >> pkg.info
-name: package_name
+  echo "type: source" >> pkg.info
-description: Package Description
+  mkdir -pv source-files
-version: 1.0
+  if [ -f "${SOURCE_FILE}" ]; then
-url: your package's website/repository url. Optional
+    touch source.temp
-license: your package's license. Optional
+    cat "${SOURCE_FILE}" > source.temp
-architecture: any
+    export NAME DESCRIPTION VERSION URL LICENSE TYPE
-type: source
+    envsubst '$NAME:$DESCRIPTION:$VERSION:$URL:$LICENSE:$TYPE' < source.temp > source.sh
-EOF
+    rm source.temp
-  cat > source.sh << 'EOF'
+  else
-# This is the source.sh script. It is executed by BPM in a temporary directory when compiling a source package
+    echo "Source file at ${SOURCE_FILE} does not exist! Creating empty source.sh instead..."
-# 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
+    touch source.sh
-# It is recommended you create the 'output' directory along with a 'source' directory in the root of the temporary directory like this
+  fi
-echo "Compiling my_program..."
-# Creating 'source' and 'output' directory variables
-source=$(pwd)/source
-output=$(pwd)/output
-# Creating the 'source' and 'output' directories
-mkdir $source
-mkdir $output
-# Downloading files
-git clone https://myrepo.com/repo.git source
-EOF
   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 do properly compile your program"
+  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"
-  echo "You can turn your package into a .bpm file use the 'bpm-create <name>' command"
+  echo "You can add additional files that will be used during compilation to the 'source-files' directory"
+  echo "You can turn your package into a .bpm file use the 'bpm-package <filename>' command"
 fi

test_packages/x86_64/bpm-utils/pkg.info

@@ -1,7 +1,8 @@
 name: bpm-utils
 description: Utilities to create BPM packages
-version: 1.4.0
+version: 2.0.0
 url: https://gitlab.com/bubble-package-manager/bpm/
 license: GPL3
-architecture: x86_64
+architecture: any
-type: binary
+keep: etc/bpm-utils/source.default
+type: binary

test_packages/x86_64/bpm/pkg.info

@@ -1,6 +1,6 @@
 name: bpm
 description: The Bubble Package Manager
-version: 0.1.7
+version: 0.2.0
 url: https://gitlab.com/bubble-package-manager/bpm/
 license: GPL3
 architecture: x86_64