Makefile

@@ -1,5 +1,5 @@
 SUBDIRS := $(wildcard */.)
-VERSION = 24.09
+VERSION = 24.07
 
 install:
 	@for dir in $(SUBDIRS) ; do \

matter-iso/main.sh

@@ -200,7 +200,7 @@ rm "${tmpdir}/stager.sh"
 
 info "Cleaning up and building initrd"
 rm "${isoh}"
-pushd "${tmpdir}" > /dev/null
+pushd "$TMPDIR" > /dev/null
   mkdir -p "${rootdir}/boot"
   find . | cpio --quiet -H newc -o | xz -T0 --check=crc32 > "${rootdir}/boot/initrd.img"
   check_ret "Failed to build initrd"

mp-build/scripts/mp-build.sh

@@ -110,7 +110,7 @@ clean_dist() {
   rm -f "${distpath}/files.tar.gz"
 }
 
-# install a list of packages with matt
+# install a list of packages with matt 
 matt_install(){
   if [ "$EUID" -ne 0 ]; then
     if type doas > /dev/null; then
@@ -122,7 +122,7 @@ matt_install(){
       return 1
     fi
   fi
-
+  
   $DOAS matt install --yes --skip --ignore-none $@
   return $?
 }
@@ -421,11 +421,6 @@ mkdir -p "${distpath}"
 clean_dist
 
 # build the files archive
-if [ -z "$(ls -A)" ]; then
-  error "Root directory is empty, did something went wrong during build?"
-  exit 1
-fi
-
 find . -printf "%P\n" | fakeroot tar -czf "${distpath}/files.tar.gz" --no-recursion -T -
 check_ret "(1/6) Failed to create the files archive (files.tar.gz)"
 success "(1/6) Created the files archive (files.tar.gz)"

mp-check/main.sh

@@ -34,7 +34,7 @@ fi
 ## global vars ##
 #################
 warnc=0
-tmpdir="/tmp/.mp-check"
+tmpdir="/tmp/.mp-clean"
 required_files=(
   "DATA"
   "HASHES"
@@ -54,7 +54,6 @@ root_dirs=(
   "usr"
   "var"
   "opt"
-  "run"
 )
 bad_vars=(
   '$VERSION'
@@ -174,26 +173,6 @@ check_archive(){
         fail_check
       fi
     fi
-
-    if [ "${k}" == "size" ]; then
-      if [ ! -z "${line_1}" ]; then
-        size="$(echo "${line_1}" | sed 's/size= //g')"
-        size="$(echo "${size}" | sed 's/size=//g')"
-      else
-        size="$(echo "${line_2}" | sed 's/size = //g')"
-        size="$(echo "${size}" | sed 's/size =//g')"
-      fi
-
-      if [ -z "${size}" ]; then
-        error "Failed to obtain package size information"
-        fail_check
-      fi
-
-      if [ "${size}" == "0" ]; then
-        error "Package size information is set as 0, is the package empty?"
-        fail_check
-      fi
-    fi
   done
 
   name="$(head -n1 "${tmpdir}/DATA" | sed 's/\[//g')"
@@ -204,24 +183,6 @@ check_archive(){
     fail_check
   fi
 
-  case "${name}" in
-    *_*)
-      error "Package name contains an invalid character: \"_\""
-      fail_check ;;
-    *" "*)
-      error "Package name contains an invalid character: \" \""
-      fail_check ;;
-  esac
-
-  case "${version}" in
-    *_*)
-      error "Package version contains an invalid character: \"_\""
-      fail_check ;;
-    *" "*)
-      error "Package version contains an invalid character: \" \""
-      fail_check ;;
-  esac
-
   filename="${name}_${version}.mpf"
 
   info "Checking HASHES file"
@@ -246,15 +207,8 @@ check_archive(){
   done < "${tmpdir}/HASHES"
 
   info "Checking files.tar.gz archive"
-  filec=0
 
   while read p; do
-    if [ -z "${p}" ]; then
-      continue
-    fi
-
-    filec=$((filec + 1))
-
     if [ "${p:0:1}" == "." ] || [ "${p:0:1}" == "/" ]; then
       error "Root file location is invalid (${p:0:1})"
       fail_check
@@ -276,11 +230,6 @@ check_archive(){
     fi
   done < <(tar tf "${tmpdir}/files.tar.gz")
 
-  if [ "${filec}" == "0" ]; then
-    error "Package file archive is empty (no files)"
-    fail_check
-  fi
-
   info "Checking INSTALL file"
 
   if [ -f "${tmpdir}/INSTALL" ] && ! grep -q . "${tmpdir}/INSTALL"; then

mtsc-common/common.sh

@@ -228,17 +228,6 @@ check_pkg_vars() {
       return 1 ;;
   esac
 
-  case "${VERSION}" in
-    *_*)
-      error "Package version contains an invalid character: \"_\""
-      unset_indent
-      return 1 ;;
-    *" "*)
-      error "Package version contains an invalid character: \" \""
-      unset_indent
-      return 1 ;;
-  esac
-
   return 0
 }