Commit 975ebcd4 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm: hide extra requires

parent 8264ce7c
...@@ -635,8 +635,8 @@ elif [ "$(uname)" = "Linux" ] && is_command guix ; then ...@@ -635,8 +635,8 @@ elif [ "$(uname)" = "Linux" ] && is_command guix ; then
# fixme: move to up # fixme: move to up
elif [ "$(uname)" = "Linux" ] && [ -x $ROOTDIR/system/bin/getprop ] ; then elif [ "$(uname)" = "Linux" ] && [ -x $ROOTDIR/system/bin/getprop ] ; then
DISTRIB_ID="Android" DISTRIB_ID="Android"
DISTRIB_RELEASE=$(getprop | awk -F": " '/system.build.version.release\]/ { print $2 }' | tr -d '[]' | head -n1) DISTRIB_RELEASE=$(a='' getprop | awk -F": " '/system.build.version.release\]/ { print $2 }' | tr -d '[]' | head -n1)
[ -n "$DISTRIB_RELEASE" ] || DISTRIB_RELEASE=$(getprop | awk -F": " '/build.version.release/ { print $2 }' | tr -d '[]' | head -n1) [ -n "$DISTRIB_RELEASE" ] || DISTRIB_RELEASE=$(a='' getprop | awk -F": " '/build.version.release/ { print $2 }' | tr -d '[]' | head -n1)
elif [ "$(uname -o 2>/dev/null)" = "Cygwin" ] ; then elif [ "$(uname -o 2>/dev/null)" = "Cygwin" ] ; then
DISTRIB_ID="Cygwin" DISTRIB_ID="Cygwin"
...@@ -768,7 +768,7 @@ get_bit_size() ...@@ -768,7 +768,7 @@ get_bit_size()
{ {
local DIST_BIT local DIST_BIT
DIST_BIT="$(getconf LONG_BIT 2>/dev/null)" DIST_BIT="$(a= getconf LONG_BIT 2>/dev/null)"
if [ -n "$DIST_BIT" ] ; then if [ -n "$DIST_BIT" ] ; then
echo "$DIST_BIT" echo "$DIST_BIT"
return return
...@@ -817,7 +817,7 @@ get_memory_size() ...@@ -817,7 +817,7 @@ get_memory_size()
[ -r /proc/meminfo ] && detected=$((`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`/1024)) [ -r /proc/meminfo ] && detected=$((`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`/1024))
;; ;;
solaris) solaris)
detected=$(prtconf | grep Memory | sed -e "s|Memory size: \([0-9][0-9]*\) Megabyte.*|\1|") #" detected=$(a='' prtconf | grep Memory | sed -e "s|Memory size: \([0-9][0-9]*\) Megabyte.*|\1|") #"
;; ;;
# *) # *)
# fatal "Unsupported OS $DIST_OS" # fatal "Unsupported OS $DIST_OS"
......
...@@ -387,7 +387,7 @@ __epm_addrepo_deb() ...@@ -387,7 +387,7 @@ __epm_addrepo_deb()
assure_exists apt-add-repository software-properties-common assure_exists apt-add-repository software-properties-common
local ad="$DISTRARCH" local ad="$DISTRARCH"
# TODO: move to distro_info # TODO: move to distro_info
local nd="$(lsb_release -cs)" local nd="$(a= lsb_release -cs)"
local repo="$*" local repo="$*"
if [ -z "$repo" ] || [ "$repo" = "--help" ]; then if [ -z "$repo" ] || [ "$repo" = "--help" ]; then
......
...@@ -86,7 +86,7 @@ case $PMTYPE in ...@@ -86,7 +86,7 @@ case $PMTYPE in
docmd epm upgrade docmd epm upgrade
assure_exists package-cleanup yum-utils assure_exists package-cleanup yum-utils
showcmd package-cleanup --orphans showcmd package-cleanup --orphans
local PKGLIST=$(package-cleanup -q --orphans | grep -v "^eepm-") local PKGLIST=$(a= package-cleanup -q --orphans | grep -v "^eepm-")
docmd epm remove $dryrun $PKGLIST docmd epm remove $dryrun $PKGLIST
;; ;;
dnf-rpm) dnf-rpm)
...@@ -94,7 +94,7 @@ case $PMTYPE in ...@@ -94,7 +94,7 @@ case $PMTYPE in
docmd epm upgrade docmd epm upgrade
assure_exists package-cleanup dnf-utils assure_exists package-cleanup dnf-utils
showcmd package-cleanup --orphans showcmd package-cleanup --orphans
local PKGLIST=$(package-cleanup -q --orphans | grep -v "^eepm-") local PKGLIST=$(a= package-cleanup -q --orphans | grep -v "^eepm-")
docmd epm remove $dryrun $PKGLIST docmd epm remove $dryrun $PKGLIST
;; ;;
urpm-rpm) urpm-rpm)
...@@ -137,7 +137,7 @@ case $PMTYPE in ...@@ -137,7 +137,7 @@ case $PMTYPE in
# For zypper < 1.9.2: zypper se -si | grep 'System Packages' # For zypper < 1.9.2: zypper se -si | grep 'System Packages'
sudocmd zypper packages --orphaned sudocmd zypper packages --orphaned
# FIXME: x86_64/i586 are duplicated # FIXME: x86_64/i586 are duplicated
local PKGLIST=$(zypper packages --orphaned | tail -n +5 | cut -d \| -f 3 | sort -u) local PKGLIST=$(a= zypper packages --orphaned | tail -n +5 | cut -d \| -f 3 | sort -u)
docmd epm remove $dryrun --clean-deps $PKGLIST docmd epm remove $dryrun --clean-deps $PKGLIST
;; ;;
xbps) xbps)
......
...@@ -42,7 +42,7 @@ __epm_autoremove_altrpm_pp() ...@@ -42,7 +42,7 @@ __epm_autoremove_altrpm_pp()
local flag= local flag=
showcmd "apt-cache list-nodeps | grep -E -- \"$libexclude\"" showcmd "apt-cache list-nodeps | grep -E -- \"$libexclude\""
fullpkgs=$(apt-cache list-nodeps | grep -E -- "$libexclude" ) fullpkgs=$(a= apt-cache list-nodeps | grep -E -- "$libexclude" )
pkgs=$(skip_manually_installed $fullpkgs) pkgs=$(skip_manually_installed $fullpkgs)
if [ -n "$dryrun" ] ; then if [ -n "$dryrun" ] ; then
...@@ -110,7 +110,7 @@ __epm_autoremove_altrpm_lib() ...@@ -110,7 +110,7 @@ __epm_autoremove_altrpm_lib()
# https://www.altlinux.org/APT_в_ALT_Linux/Советы_по_использованию#apt-cache_list-nodeps # https://www.altlinux.org/APT_в_ALT_Linux/Советы_по_использованию#apt-cache_list-nodeps
showcmd "apt-cache list-nodeps | grep -E -- \"$libgrep\"" showcmd "apt-cache list-nodeps | grep -E -- \"$libgrep\""
fullpkgs=$(apt-cache list-nodeps | grep -E -- "$libgrep" \ fullpkgs=$(a= apt-cache list-nodeps | grep -E -- "$libgrep" \
| sed -e "s/[-\.]32bit$//g" \ | sed -e "s/[-\.]32bit$//g" \
| grep -E -v -- "$develrule" \ | grep -E -v -- "$develrule" \
| grep -E -v -- "-(debuginfo)$" \ | grep -E -v -- "-(debuginfo)$" \
...@@ -297,7 +297,7 @@ case $PMTYPE in ...@@ -297,7 +297,7 @@ case $PMTYPE in
# shellcheck disable=SC2046 # shellcheck disable=SC2046
docmd package-cleanup --leaves $(subst_option non_interactive --assumeyes) docmd package-cleanup --leaves $(subst_option non_interactive --assumeyes)
# FIXME: package-cleanup have to use stderr for errors # FIXME: package-cleanup have to use stderr for errors
local PKGLIST=$(package-cleanup -q --leaves | grep -v "^eepm-") local PKGLIST=$(a= package-cleanup -q --leaves | grep -v "^eepm-")
[ -n "$PKGLIST" ] || break [ -n "$PKGLIST" ] || break
docmd epm remove $PKGLIST docmd epm remove $PKGLIST
done done
...@@ -339,7 +339,7 @@ case $PMTYPE in ...@@ -339,7 +339,7 @@ case $PMTYPE in
assure_exists zypper zypper 1.9.3 assure_exists zypper zypper 1.9.3
sudocmd zypper packages --unneeded sudocmd zypper packages --unneeded
# FIXME: x86_64/i586 are duplicated # FIXME: x86_64/i586 are duplicated
local PKGLIST=$(zypper packages --unneeded | tail -n +5 | cut -d \| -f 3 | sort -u) local PKGLIST=$(a= zypper packages --unneeded | tail -n +5 | cut -d \| -f 3 | sort -u)
showcmd epm remove --clean-deps $PKGLIST showcmd epm remove --clean-deps $PKGLIST
;; ;;
xbps) xbps)
......
...@@ -22,7 +22,7 @@ load_helper epm-sh-warmup ...@@ -22,7 +22,7 @@ load_helper epm-sh-warmup
__aptcyg_print_full() __aptcyg_print_full()
{ {
#showcmd apt-cyg show #showcmd apt-cyg show
local VERSION=$(apt-cyg show "$1" | grep -m1 "^version: " | sed -e "s|^version: ||g") local VERSION=$(a= apt-cyg show "$1" | grep -m1 "^version: " | sed -e "s|^version: ||g")
echo "$1-$VERSION" echo "$1-$VERSION"
} }
......
...@@ -22,7 +22,7 @@ load_helper epm-sh-warmup ...@@ -22,7 +22,7 @@ load_helper epm-sh-warmup
__aptcyg_print_full() __aptcyg_print_full()
{ {
#showcmd apt-cyg show #showcmd apt-cyg show
local VERSION=$(apt-cyg show "$1" | grep -m1 "^version: " | sed -e "s|^version: ||g") local VERSION=$(a= apt-cyg show "$1" | grep -m1 "^version: " | sed -e "s|^version: ||g")
echo "$1-$VERSION" echo "$1-$VERSION"
} }
......
...@@ -79,7 +79,7 @@ esac ...@@ -79,7 +79,7 @@ esac
__aptcyg_print_full() __aptcyg_print_full()
{ {
#showcmd apt-cyg show #showcmd apt-cyg show
local VERSION=$(apt-cyg show "$1" | grep -m1 "^version: " | sed -e "s|^version: ||g") local VERSION=$(a= apt-cyg show "$1" | grep -m1 "^version: " | sed -e "s|^version: ||g")
echo "$1-$VERSION" echo "$1-$VERSION"
} }
......
...@@ -48,7 +48,7 @@ assure_safe_run() ...@@ -48,7 +48,7 @@ assure_safe_run()
return return
fi fi
res="$(busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager KillUserProcesses)" res="$(a= busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager KillUserProcesses)"
if [ "$res" = "b false" ] ; then if [ "$res" = "b false" ] ; then
message "Good news: systemd-logind will not kill your screen processes (KillUserProcesses=false)" message "Good news: systemd-logind will not kill your screen processes (KillUserProcesses=false)"
return return
......
...@@ -34,7 +34,7 @@ __epm_repodisable_alt() ...@@ -34,7 +34,7 @@ __epm_repodisable_alt()
[ -z "$rl" ] && warning 'Cant find $1 entries in the repos (see # epm repolist output)' && return 1 [ -z "$rl" ] && warning 'Cant find $1 entries in the repos (see # epm repolist output)' && return 1
fi fi
echo "$rl" | while read rp ; do echo "$rl" | while read rp ; do
[ -n "$dryrun" ] && messagw 'will comment $rp' && continue [ -n "$dryrun" ] && message 'will comment $rp' && continue
sed -i -e "s|^\($(sed_escape "$rl")\)|#\1|" $alt_LISTS sed -i -e "s|^\($(sed_escape "$rl")\)|#\1|" $alt_LISTS
done done
} }
......
...@@ -94,7 +94,7 @@ epm_requires_files() ...@@ -94,7 +94,7 @@ epm_requires_files()
;; ;;
eopkg) eopkg)
showcmd eopkg info $fl showcmd eopkg info $fl
LC_ALL=C eopkg info $fl | grep "^Dependencies" | head -n1 | sed -e "s|Dependencies[[:space:]]*: ||" LC_ALL=C a='' eopkg info $fl | grep "^Dependencies" | head -n1 | sed -e "s|Dependencies[[:space:]]*: ||"
;; ;;
ELF) ELF)
__epm_elf_requires $fl __epm_elf_requires $fl
...@@ -189,7 +189,7 @@ case $PMTYPE in ...@@ -189,7 +189,7 @@ case $PMTYPE in
;; ;;
eopkg) eopkg)
showcmd eopkg info $pkg_names showcmd eopkg info $pkg_names
LC_ALL=C eopkg info $pkg_names | grep "^Dependencies" | sed -e "s|Dependencies[[:space:]]*: ||" LC_ALL=C a='' eopkg info $pkg_names | grep "^Dependencies" | sed -e "s|Dependencies[[:space:]]*: ||"
return return
;; ;;
xbps) xbps)
......
...@@ -446,7 +446,7 @@ set_sudo() ...@@ -446,7 +446,7 @@ set_sudo()
# start error section # start error section
SUDO_TESTED="1" SUDO_TESTED="1"
if is_command doas && doas -C /etc/doas.conf > /dev/null 2>&1 ; then if is_command doas && a='' doas -C /etc/doas.conf > /dev/null 2>&1 ; then
SUDO="doas" SUDO="doas"
SUDO_TESTED="0" SUDO_TESTED="0"
return "$SUDO_TESTED" return "$SUDO_TESTED"
......
...@@ -179,7 +179,7 @@ epm_upgrade() ...@@ -179,7 +179,7 @@ epm_upgrade()
;; ;;
homebrew) homebrew)
#CMD="brew upgrade" #CMD="brew upgrade"
sudocmd brew upgrade $(brew outdated) sudocmd brew upgrade $(a='' brew outdated)
return return
;; ;;
opkg) opkg)
......
...@@ -96,7 +96,7 @@ case $PMTYPE in ...@@ -96,7 +96,7 @@ case $PMTYPE in
eopkg) eopkg)
showcmd eopkg info $pkg showcmd eopkg info $pkg
# eopkg info prints it only from repo info # eopkg info prints it only from repo info
LC_ALL=C eopkg info $pkg | grep "^Reverse Dependencies" | sed -e "s|Reverse Dependencies[[:space:]]*: ||" | grep -v "^$" LC_ALL=C a= eopkg info $pkg | grep "^Reverse Dependencies" | sed -e "s|Reverse Dependencies[[:space:]]*: ||" | grep -v "^$"
return return
;; ;;
xbps) xbps)
......
...@@ -12,7 +12,7 @@ assure_root ...@@ -12,7 +12,7 @@ assure_root
if [ "$(epm print info -s)" = "rosa" ] ; then if [ "$(epm print info -s)" = "rosa" ] ; then
epm assure kroko-cli auto-krokodil-cli || fatal epm assure kroko-cli auto-krokodil-cli || fatal
kroko-cli autoinstall a='' kroko-cli autoinstall
exit exit
fi fi
...@@ -40,7 +40,7 @@ check_run_kernel () { ...@@ -40,7 +40,7 @@ check_run_kernel () {
} }
check_old_nvidia () { check_old_nvidia () {
local lspci_output=$(lspci -k 2>/dev/null | grep -E 'VGA|3D' | tr -d '\n') local lspci_output=$(a= lspci -k 2>/dev/null | grep -E 'VGA|3D' | tr -d '\n')
# Fermi, Kepler and Tesla # Fermi, Kepler and Tesla
[[ "$lspci_output" == *GF[0-9]* ]] || [[ "$lspci_output" == *GK[0-9]* ]] [[ "$lspci_output" == *G[0-9]* ]] || [[ "$lspci_output" == *GT[0-9]* ]] || [[ "$lspci_output" == *MCP[0-9]* ]] && return 0 [[ "$lspci_output" == *GF[0-9]* ]] || [[ "$lspci_output" == *GK[0-9]* ]] [[ "$lspci_output" == *G[0-9]* ]] || [[ "$lspci_output" == *GT[0-9]* ]] || [[ "$lspci_output" == *MCP[0-9]* ]] && return 0
return 1 return 1
...@@ -97,13 +97,13 @@ else ...@@ -97,13 +97,13 @@ else
fi fi
# Активируем службы управления питания NVIDIA, без этих служб будет некоректно работать уход в сон # Активируем службы управления питания NVIDIA, без этих служб будет некоректно работать уход в сон
systemctl enable nvidia-suspend.service nvidia-resume.service nvidia-hibernate.service a= systemctl enable nvidia-suspend.service nvidia-resume.service nvidia-hibernate.service
echo "options nvidia NVreg_PreserveVideoMemoryAllocations=1 NVreg_TemporaryFilePath=/var/tmp" > /etc/modprobe.d/nvidia_memory_allocation.conf echo "options nvidia NVreg_PreserveVideoMemoryAllocations=1 NVreg_TemporaryFilePath=/var/tmp" > /etc/modprobe.d/nvidia_memory_allocation.conf
# Запускаем регенерацию initrd # Запускаем регенерацию initrd
make-initrd a= make-initrd
# Обновляем grub # Обновляем grub
update-grub a= update-grub
echo "Done. Just you need reboot your system to use nVidia proprietary drivers." echo "Done. Just you need reboot your system to use nVidia proprietary drivers."
...@@ -41,7 +41,7 @@ libevent="$(get_libevent)" ...@@ -41,7 +41,7 @@ libevent="$(get_libevent)"
[ -n "$libevent" ] || fatal "libevent is missed, install it before" [ -n "$libevent" ] || fatal "libevent is missed, install it before"
if [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then if [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then
patchelf --replace-needed libevent-2.1.so.7 $libevent .$PRODUCTDIR/libQt5WebEngineCore.so.5 a= patchelf --replace-needed libevent-2.1.so.7 $libevent .$PRODUCTDIR/libQt5WebEngineCore.so.5
# Fix libquazip1-qt5.so name # Fix libquazip1-qt5.so name
#patchelf --replace-needed libquazip.so libquazip1-qt5.so.1.0.0 .$PRODUCTDIR/ts3client_linux_amd64 #patchelf --replace-needed libquazip.so libquazip1-qt5.so.1.0.0 .$PRODUCTDIR/ts3client_linux_amd64
fi fi
......
...@@ -32,7 +32,7 @@ libevent="$(get_libevent)" ...@@ -32,7 +32,7 @@ libevent="$(get_libevent)"
[ -n "$libevent" ] || fatal "libevent is missed, install it before" [ -n "$libevent" ] || fatal "libevent is missed, install it before"
if [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then if [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then
patchelf --replace-needed libevent-2.1.so.7 $libevent .$PRODUCTDIR/lib/libQt6WebEngineCore.so.6 a= patchelf --replace-needed libevent-2.1.so.7 $libevent .$PRODUCTDIR/lib/libQt6WebEngineCore.so.6
fi fi
......
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