Skip to content

E
eepm
Commit 2b40ba9a authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

remove extra deps

parent b97ef240
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
bin/distr_info
View file @ 2b40ba9a
...@@ -770,7 +770,7 @@ case "$DIST_ARCH" in ...@@ -770,7 +770,7 @@ case "$DIST_ARCH" in
armv7*) armv7*)
# TODO: use uname only # TODO: use uname only
# uses binutils package # uses binutils package
if is_command readelf && [ -z "$(readelf -A /proc/self/exe | grep Tag_ABI_VFP_args)" ] ; then if is_command readelf && [ -z "$(a='' readelf -A /proc/self/exe | grep Tag_ABI_VFP_args)" ] ; then
DIST_ARCH="armel" DIST_ARCH="armel"
else else
DIST_ARCH="armhf" DIST_ARCH="armhf"
...@@ -920,7 +920,7 @@ get_virt() ...@@ -920,7 +920,7 @@ get_virt()
{ {
local VIRT local VIRT
if is_command systemd-detect-virt ; then if is_command systemd-detect-virt ; then
VIRT="$(systemd-detect-virt)" VIRT="$(a='' systemd-detect-virt)"
[ "$VIRT" = "none" ] && echo "(host system)" && return [ "$VIRT" = "none" ] && echo "(host system)" && return
[ -z "$VIRT" ] && echo "(unknown)" && return [ -z "$VIRT" ] && echo "(unknown)" && return
echo "$VIRT" && return echo "$VIRT" && return
......
bin/epm-dedup
View file @ 2b40ba9a
...@@ -33,14 +33,14 @@ try_fix_apt_rpm_dupls() ...@@ -33,14 +33,14 @@ try_fix_apt_rpm_dupls()
local TODEL local TODEL
for i in $PKGLIST ; do for i in $PKGLIST ; do
local pkg=${i/.32bit/} local pkg=${i/.32bit/}
local todel="$(rpm -q $pkg | head -n1)" local todel="$(a='' rpm -q $pkg | head -n1)"
local todel2="$(rpm -q $pkg | head -n2 | tail -n1)" local todel2="$(a='' rpm -q $pkg | head -n2 | tail -n1)"
if [ "$todel" = "$todel2" ] ; then if [ "$todel" = "$todel2" ] ; then
message "Fix the same name duplicates for $pkg..." message "Fix the same name duplicates for $pkg..."
sudocmd rpm -e "$todel" --allmatches --nodeps --justdb && epm install $pkg && continue sudocmd rpm -e "$todel" --allmatches --nodeps --justdb && epm install $pkg && continue
fi fi
# first use older package # first use older package
[ "$(rpmevrcmp "$todel" "$todel2")" = "1" ] && todel="$todel2" [ "$(a='' rpmevrcmp "$todel" "$todel2")" = "1" ] && todel="$todel2"
sudocmd rpm -e "$todel" || TODEL="$TODEL $todel" sudocmd rpm -e "$todel" || TODEL="$TODEL $todel"
done done
[ -n "$TODEL" ] && sudocmd rpm -e $TODEL [ -n "$TODEL" ] && sudocmd rpm -e $TODEL
......
bin/epm-query
View file @ 2b40ba9a
...@@ -138,9 +138,9 @@ __epm_get_hilevel_nameform() ...@@ -138,9 +138,9 @@ __epm_get_hilevel_nameform()
apt-rpm) apt-rpm)
# use # as delimeter for apt # use # as delimeter for apt
local pkg local pkg
pkg=$(rpm -q --queryformat "%{NAME}=%{SERIAL}:%{VERSION}-%{RELEASE}\n" -- $1) pkg=$(a='' rpm -q --queryformat "%{NAME}=%{SERIAL}:%{VERSION}-%{RELEASE}\n" -- $1)
# for case if serial is missed # for case if serial is missed
echo $pkg | grep -q "(none)" && pkg=$(rpm -q --queryformat "%{NAME}#%{VERSION}-%{RELEASE}\n" -- $1) echo $pkg | grep -q "(none)" && pkg=$(a='' rpm -q --queryformat "%{NAME}#%{VERSION}-%{RELEASE}\n" -- $1)
# HACK: can use only for multiple install packages like kernel # HACK: can use only for multiple install packages like kernel
echo $pkg | grep -q kernel || return 1 echo $pkg | grep -q kernel || return 1
echo $pkg echo $pkg
...@@ -151,7 +151,7 @@ __epm_get_hilevel_nameform() ...@@ -151,7 +151,7 @@ __epm_get_hilevel_nameform()
local pkg local pkg
#pkg=$(rpm -q --queryformat "%{EPOCH}:%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1) #pkg=$(rpm -q --queryformat "%{EPOCH}:%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1)
#echo $pkg | grep -q "(none)" && pkg=$(rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1) #echo $pkg | grep -q "(none)" && pkg=$(rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1)
pkg=$(rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1) pkg=$(a='' rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1)
echo $pkg echo $pkg
return return
;; ;;
...@@ -238,7 +238,7 @@ __epm_query_name() ...@@ -238,7 +238,7 @@ __epm_query_name()
eopkg) eopkg)
showcmd eopkg blame $1 showcmd eopkg blame $1
local str local str
str="$(LC_ALL=C eopkg blame $1 | grep "^Name")" str="$(LC_ALL=C a='' eopkg blame $1 | grep "^Name")"
[ -n "$str" ] || return 1 [ -n "$str" ] || return 1
echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1-\2-\3|" echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1-\2-\3|"
return return
...@@ -246,7 +246,7 @@ __epm_query_name() ...@@ -246,7 +246,7 @@ __epm_query_name()
pisi) pisi)
showcmd pisi blame $1 showcmd pisi blame $1
local str local str
str="$(LC_ALL=C pisi blame $1 | grep "^Name")" str="$(LC_ALL=C a='' pisi blame $1 | grep "^Name")"
[ -n "$str" ] || return 1 [ -n "$str" ] || return 1
echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1-\2-\3|" echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1-\2-\3|"
return return
...@@ -306,7 +306,7 @@ __epm_query_shortname() ...@@ -306,7 +306,7 @@ __epm_query_shortname()
eopkg) eopkg)
showcmd eopkg blame $1 showcmd eopkg blame $1
local str local str
str="$(LC_ALL=C eopkg blame $1 | grep "^Name")" str="$(LC_ALL=C a='' eopkg blame $1 | grep "^Name")"
[ -n "$str" ] || return 1 [ -n "$str" ] || return 1
echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1|" echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1|"
return return
...@@ -314,7 +314,7 @@ __epm_query_shortname() ...@@ -314,7 +314,7 @@ __epm_query_shortname()
pisi) pisi)
showcmd pisi blame $1 showcmd pisi blame $1
local str local str
str="$(LC_ALL=C pisi blame $1 | grep "^Name")" str="$(LC_ALL=C a='' pisi blame $1 | grep "^Name")"
[ -n "$str" ] || return 1 [ -n "$str" ] || return 1
echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1|" echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1|"
return return
......
bin/epm-query_file
View file @ 2b40ba9a
...@@ -82,7 +82,7 @@ dpkg_print_name_version() ...@@ -82,7 +82,7 @@ dpkg_print_name_version()
local ver i local ver i
for i in "$@" ; do for i in "$@" ; do
[ -n "$i" ] || continue [ -n "$i" ] || continue
ver=$(dpkg -s "$i" 2>/dev/null | grep "Version:" | sed -e "s|Version: ||g") ver=$(a='' dpkg -s "$i" 2>/dev/null | grep "Version:" | sed -e "s|Version: ||g")
if [ -z "$ver" ] ; then if [ -z "$ver" ] ; then
echo "$i" echo "$i"
else else
...@@ -98,7 +98,7 @@ __do_query() ...@@ -98,7 +98,7 @@ __do_query()
case $PMTYPE in case $PMTYPE in
*-dpkg) *-dpkg)
showcmd dpkg -S "$1" showcmd dpkg -S "$1"
dpkg_print_name_version "$(dpkg -S "$1" | grep -v "^diversion by" | sed -e "s|:.*||")" dpkg_print_name_version "$(a='' dpkg -S "$1" | grep -v "^diversion by" | sed -e "s|:.*||")"
return ;; return ;;
*-rpm) *-rpm)
CMD="rpm -qf" CMD="rpm -qf"
......
bin/epm-requires
View file @ 2b40ba9a
...@@ -98,7 +98,7 @@ epm_requires_files() ...@@ -98,7 +98,7 @@ epm_requires_files()
;; ;;
pisi) pisi)
showcmd pisi info $fl showcmd pisi info $fl
LC_ALL=C pisi info $fl | grep "^Dependencies" | head -n1 | sed -e "s|Dependencies[[:space:]]*: ||" LC_ALL=C a='' pisi info $fl | grep "^Dependencies" | head -n1 | sed -e "s|Dependencies[[:space:]]*: ||"
;; ;;
ELF) ELF)
__epm_elf_requires $fl __epm_elf_requires $fl
...@@ -198,7 +198,7 @@ case $PMTYPE in ...@@ -198,7 +198,7 @@ case $PMTYPE in
;; ;;
pisi) pisi)
showcmd pisi info $pkg_names showcmd pisi info $pkg_names
LC_ALL=C pisi info $pkg_names | grep "^Dependencies" | sed -e "s|Dependencies[[:space:]]*: ||" LC_ALL=C a='' pisi info $pkg_names | grep "^Dependencies" | sed -e "s|Dependencies[[:space:]]*: ||"
return return
;; ;;
xbps) xbps)
......
bin/epm-whatdepends
View file @ 2b40ba9a
...@@ -96,13 +96,13 @@ case $PMTYPE in ...@@ -96,13 +96,13 @@ 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 a= 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
;; ;;
pisi) pisi)
showcmd pisi info $pkg showcmd pisi info $pkg
# pisi info prints it only from repo info # pisi info prints it only from repo info
LC_ALL=C pisi info $pkg | grep "^Reverse Dependencies" | sed -e "s|Reverse Dependencies[[:space:]]*: ||" | grep -v "^$" LC_ALL=C a='' pisi info $pkg | grep "^Reverse Dependencies" | sed -e "s|Reverse Dependencies[[:space:]]*: ||" | grep -v "^$"
return return
;; ;;
xbps) xbps)
......
prescription.d/waydroid.sh
View file @ 2b40ba9a
...@@ -60,7 +60,7 @@ waydroid_install () { ...@@ -60,7 +60,7 @@ waydroid_install () {
waydroid_select_gpu () { waydroid_select_gpu () {
echo "Select GPU for Waydroid" echo "Select GPU for Waydroid"
gpu_info=$(lspci -nn | grep '\[03') gpu_info=$(a='' lspci -nn | grep '\[03')
gpu_number=$(echo "$gpu_info" | awk '{print $1}') gpu_number=$(echo "$gpu_info" | awk '{print $1}')
gpu_name=$(echo "$gpu_info" | grep -oP '(?<=: ).*') gpu_name=$(echo "$gpu_info" | grep -oP '(?<=: ).*')
......
repack.d/sunshine.sh
View file @ 2b40ba9a
...@@ -47,10 +47,10 @@ fi ...@@ -47,10 +47,10 @@ fi
# Replace fedora libboost to system libboost # Replace fedora libboost to system libboost
for lib in ${BOOST_LIBS}; do for lib in ${BOOST_LIBS}; do
patchelf --replace-needed "libboost_${lib}.so.${BOOST_FEDORA_VERSION}" "libboost_${lib}.so.${BOOST_REPO_VERSION}" "usr/bin/sunshine" a='' patchelf --replace-needed "libboost_${lib}.so.${BOOST_FEDORA_VERSION}" "libboost_${lib}.so.${BOOST_REPO_VERSION}" "usr/bin/sunshine"
done done
# Replace fedora libminiupnpc to system libminiupnpc # Replace fedora libminiupnpc to system libminiupnpc
patchelf --replace-needed "libminiupnpc.so.$MINIUPNPC_FEDORA_VERSION" "libminiupnpc.so.$MINIUPNPC_REPO_VERSION" "usr/bin/sunshine" a='' patchelf --replace-needed "libminiupnpc.so.$MINIUPNPC_FEDORA_VERSION" "libminiupnpc.so.$MINIUPNPC_REPO_VERSION" "usr/bin/sunshine"
add_libs_requires add_libs_requires
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