commit packed 3.64.35

packed/epm.sh

@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR"
 # will replaced with /etc/eepm during install
 CONFIGDIR="$PROGDIR/../etc"
 
-export EPMVERSION="3.64.34"
+export EPMVERSION="3.64.35"
 
 # package, single (file), pipe, git
 EPMMODE="package"
@@ -5849,6 +5849,10 @@ elif [ -f "$EFI/refind_linux.conf" ]; then
     entry_file="$EFI/refind_linux.conf"
     options="Boot with standard options"
     bootloader="refind"
+elif [ -f "$EFI/limine.conf" ]; then
+    entry_file="$EFI/limine.conf"
+    options="kernel_cmdline:"
+    bootloader="limine"
 fi
 
 epm_kernel_update()
@@ -5917,6 +5921,12 @@ esac
 kernel_options_list () {
     if [ "$bootloader" = "refind" ] ; then
         grep "^\"$options\"" "$entry_file" | sed 's/^\"'"$options"'" //' | sed 's/\s*$//' | tr ' ' '\n'
+    elif [ "$bootloader" = "limine" ]; then
+        echo "=== All kernel command lines in Limine config ==="
+        grep "^[[:space:]]*$options" "$entry_file" | while read -r line; do
+            echo "$line" | sed "s/^[[:space:]]*${options}[[:space:]]*//" | tr ' ' '\n'
+            echo "---"
+        done
     else
         grep "^$options" "$entry_file" | sed 's/^"'$options'" //' | sed 's/\s*$//' | tr ' ' '\n'
     fi
@@ -5929,8 +5939,10 @@ kernel_options_add () {
         else
             echo "The string '$search_string' is not present in $entry_file"
             echo "Updating $entry_file"
-            if [ $bootloader = "systemd" ]; then
+            if [ "$bootloader" = "systemd" ]; then
                 sed -i "/^$options/ s~\$~ $search_string~" "$entry_file"
+            elif [ "$bootloader" = "limine" ]; then
+                sed -i "/^[[:space:]]*$options/ s~\$~ $search_string~" "$entry_file"
             else
                 sed -i "s|\(^$options[\"']\)\(.*\)\([\"']\)|\1\2 $search_string\3|" "$entry_file"
             fi
@@ -5942,8 +5954,12 @@ kernel_options_add () {
 kernel_options_remove() {
     for remove_string in "$@"; do
         if grep -qF "$remove_string" "$entry_file"; then
-            sed -i "s~ $remove_string~~" "$entry_file"
             echo "Removed '$remove_string' from the kernel parameters in $entry_file"
+            if [ "$bootloader" = "limine" ]; then
+                sed -i "/^[[:space:]]*$options/ s~ $remove_string~~g" "$entry_file"
+            else
+                sed -i "s~ $remove_string~~g" "$entry_file"
+            fi
         else
             echo "The string '$remove_string' is not present in $entry_file"
         fi
@@ -6636,6 +6652,7 @@ __epm_pack_run_handler()
     local tarname="$2"
     local packversion="$3"
     local url="$4"
+    shift 4
     returntarname=''
 
     local repackcode="$EPM_PACK_SCRIPTS_DIR/$packname.sh"
@@ -6650,7 +6667,7 @@ __epm_pack_run_handler()
     [ -n "$debug" ] && bashopt='-x'
     #info "Running $($script --description 2>/dev/null) ..."
     # TODO: add url info here
-    ( unset BASH_ENV ; unset EPMCURDIR ; export PATH=$SCPATH ; export HOME=$(pwd) ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" "$url") || fatal
+    ( unset BASH_ENV ; unset EPMCURDIR ; export PATH=$SCPATH ; export HOME=$(pwd) ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" "$url" "$@") || fatal
     returntarname="$(cat "$filefortarname")" || fatal 'pack script $repackcode didn'\''t set tarname'
 
     local i
@@ -6764,13 +6781,16 @@ epm_pack()
 
 case "$1" in
     -h|--help)                     # HELPCMD: help
-        epm_epm_install_help
+        epm_pack_help
         return
         ;;
     --list)                        # HELPCMD: list all available receipts
         __list_all_app
         return
         ;;
+    "")
+        fatal "Missed params. run with --help to get help."
+        ;;
 esac
 
     local tmpdir
@@ -6781,6 +6801,7 @@ esac
     local tarname="$2"
     local packversion="$3"
     local url=''
+    shift 3
 
     [ -n "$packname" ] || __epm_pack_list
 
@@ -6805,7 +6826,7 @@ esac
     fi
 
     cd $tmpdir || fatal
-    __epm_pack "$packname" "$tarname" "$packversion" "$url"
+    __epm_pack "$packname" "$tarname" "$packversion" "$url" "$@"
 
 }
 
@@ -13332,7 +13353,7 @@ case $PMTYPE in
 esac
 
 LC_ALL=C docmd $CMD $string
-epm play $short --list-all | sed -e 's|^ *||g' -e 's|[[:space:]]\+| |g' -e "s|\$| (use \'epm play\' to install it)|"
+epm play $short --quiet --list-all | sed -e 's|^ *||g' -e 's|[[:space:]]\+| |g' -e "s|\$| (use \'epm play\' to install it)|"
 }
 
 

packed/serv.sh

@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
 # will replaced with /etc/eepm during install
 CONFIGDIR=$PROGDIR/../etc
 
-EPMVERSION="3.64.34"
+EPMVERSION="3.64.35"
 
 # package, single (file), pipe, git
 EPMMODE="package"