Commit 4a8c70a9 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.64.35

parent 9b63572b
...@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR" ...@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR"
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR="$PROGDIR/../etc" CONFIGDIR="$PROGDIR/../etc"
export EPMVERSION="3.64.34" export EPMVERSION="3.64.35"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -5849,6 +5849,10 @@ elif [ -f "$EFI/refind_linux.conf" ]; then ...@@ -5849,6 +5849,10 @@ elif [ -f "$EFI/refind_linux.conf" ]; then
entry_file="$EFI/refind_linux.conf" entry_file="$EFI/refind_linux.conf"
options="Boot with standard options" options="Boot with standard options"
bootloader="refind" bootloader="refind"
elif [ -f "$EFI/limine.conf" ]; then
entry_file="$EFI/limine.conf"
options="kernel_cmdline:"
bootloader="limine"
fi fi
epm_kernel_update() epm_kernel_update()
...@@ -5917,6 +5921,12 @@ esac ...@@ -5917,6 +5921,12 @@ esac
kernel_options_list () { kernel_options_list () {
if [ "$bootloader" = "refind" ] ; then if [ "$bootloader" = "refind" ] ; then
grep "^\"$options\"" "$entry_file" | sed 's/^\"'"$options"'" //' | sed 's/\s*$//' | tr ' ' '\n' 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 else
grep "^$options" "$entry_file" | sed 's/^"'$options'" //' | sed 's/\s*$//' | tr ' ' '\n' grep "^$options" "$entry_file" | sed 's/^"'$options'" //' | sed 's/\s*$//' | tr ' ' '\n'
fi fi
...@@ -5929,8 +5939,10 @@ kernel_options_add () { ...@@ -5929,8 +5939,10 @@ kernel_options_add () {
else else
echo "The string '$search_string' is not present in $entry_file" echo "The string '$search_string' is not present in $entry_file"
echo "Updating $entry_file" echo "Updating $entry_file"
if [ $bootloader = "systemd" ]; then if [ "$bootloader" = "systemd" ]; then
sed -i "/^$options/ s~\$~ $search_string~" "$entry_file" sed -i "/^$options/ s~\$~ $search_string~" "$entry_file"
elif [ "$bootloader" = "limine" ]; then
sed -i "/^[[:space:]]*$options/ s~\$~ $search_string~" "$entry_file"
else else
sed -i "s|\(^$options[\"']\)\(.*\)\([\"']\)|\1\2 $search_string\3|" "$entry_file" sed -i "s|\(^$options[\"']\)\(.*\)\([\"']\)|\1\2 $search_string\3|" "$entry_file"
fi fi
...@@ -5942,8 +5954,12 @@ kernel_options_add () { ...@@ -5942,8 +5954,12 @@ kernel_options_add () {
kernel_options_remove() { kernel_options_remove() {
for remove_string in "$@"; do for remove_string in "$@"; do
if grep -qF "$remove_string" "$entry_file"; then 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" 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 else
echo "The string '$remove_string' is not present in $entry_file" echo "The string '$remove_string' is not present in $entry_file"
fi fi
...@@ -6636,6 +6652,7 @@ __epm_pack_run_handler() ...@@ -6636,6 +6652,7 @@ __epm_pack_run_handler()
local tarname="$2" local tarname="$2"
local packversion="$3" local packversion="$3"
local url="$4" local url="$4"
shift 4
returntarname='' returntarname=''
local repackcode="$EPM_PACK_SCRIPTS_DIR/$packname.sh" local repackcode="$EPM_PACK_SCRIPTS_DIR/$packname.sh"
...@@ -6650,7 +6667,7 @@ __epm_pack_run_handler() ...@@ -6650,7 +6667,7 @@ __epm_pack_run_handler()
[ -n "$debug" ] && bashopt='-x' [ -n "$debug" ] && bashopt='-x'
#info "Running $($script --description 2>/dev/null) ..." #info "Running $($script --description 2>/dev/null) ..."
# TODO: add url info here # 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' returntarname="$(cat "$filefortarname")" || fatal 'pack script $repackcode didn'\''t set tarname'
local i local i
...@@ -6764,13 +6781,16 @@ epm_pack() ...@@ -6764,13 +6781,16 @@ epm_pack()
case "$1" in case "$1" in
-h|--help) # HELPCMD: help -h|--help) # HELPCMD: help
epm_epm_install_help epm_pack_help
return return
;; ;;
--list) # HELPCMD: list all available receipts --list) # HELPCMD: list all available receipts
__list_all_app __list_all_app
return return
;; ;;
"")
fatal "Missed params. run with --help to get help."
;;
esac esac
local tmpdir local tmpdir
...@@ -6781,6 +6801,7 @@ esac ...@@ -6781,6 +6801,7 @@ esac
local tarname="$2" local tarname="$2"
local packversion="$3" local packversion="$3"
local url='' local url=''
shift 3
[ -n "$packname" ] || __epm_pack_list [ -n "$packname" ] || __epm_pack_list
...@@ -6805,7 +6826,7 @@ esac ...@@ -6805,7 +6826,7 @@ esac
fi fi
cd $tmpdir || fatal cd $tmpdir || fatal
__epm_pack "$packname" "$tarname" "$packversion" "$url" __epm_pack "$packname" "$tarname" "$packversion" "$url" "$@"
} }
...@@ -13332,7 +13353,7 @@ case $PMTYPE in ...@@ -13332,7 +13353,7 @@ case $PMTYPE in
esac esac
LC_ALL=C docmd $CMD $string 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)|"
} }
......
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.64.34" EPMVERSION="3.64.35"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment