gh_mirrors/reinstall
1
0
Fork 0
mirror of https://github.com/bin456789/reinstall.git synced 2025-01-19 04:49:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

common: 改善逻辑和错误

Browse Source
This commit is contained in:
bin456789 2023-07-05 21:57:27 +08:00
parent 82181c8090
commit 1f1785c105
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
reinstall.sh
View File

@ -86,8 +86,10 @@ test_url() {
} }
add_community_repo_for_alpine() { add_community_repo_for_alpine() {
if ! grep -x 'http.*/community' /etc/apk/repositories; then
alpine_ver=$(cut -d. -f1,2 </etc/alpine-release) alpine_ver=$(cut -d. -f1,2 </etc/alpine-release)
echo http://dl-cdn.alpinelinux.org/alpine/v$alpine_ver/community >>/etc/apk/repositories echo http://dl-cdn.alpinelinux.org/alpine/v$alpine_ver/community >>/etc/apk/repositories
fi
} }
is_virt() { is_virt() {
@ -103,10 +105,7 @@ is_virt() {
if command -v systemd-detect-virt; then if command -v systemd-detect-virt; then
systemd-detect-virt systemd-detect-virt
else else
if ! install_pkg virt-what && [ -f /etc/alpine-release ]; then
add_community_repo_for_alpine
install_pkg virt-what install_pkg virt-what
fi
virt-what virt-what
fi fi
fi fi
@ -123,7 +122,7 @@ setos() {
if is_virt; then if is_virt; then
# alpine aarch64 3.18 才有 virt 直连链接 # alpine aarch64 3.18 才有 virt 直连链接
if [ "$basearch" == aarch64 ]; then if [ "$basearch" == aarch64 ]; then
(($("$releasever >= 3.18" | bc))) && flavour=virt (($(echo "$releasever >= 3.18" | bc))) && flavour=virt
else else
flavour=virt flavour=virt
fi fi
@ -293,12 +292,18 @@ install_pkg() {
[ "$pkg" = util-linux ] && pkg=lsmem [ "$pkg" = util-linux ] && pkg=lsmem
if ! command -v $pkg >/dev/null; then if ! command -v $pkg >/dev/null; then
{ {
if [ -f /etc/alpine-release ]; then
if ! apk add $pkgs; then
add_community_repo_for_alpine
apk add $pkgs
fi
else
apt_install $pkgs || apt_install $pkgs ||
dnf install -y $pkgs || dnf install -y $pkgs ||
yum install -y $pkgs || yum install -y $pkgs ||
zypper install -y $pkgs || zypper install -y $pkgs ||
pacman -Syu --noconfirm $pkgs || pacman -Syu --noconfirm $pkgs
apk add $pkgs fi
} 2>/dev/null } 2>/dev/null
# break 返回值始终为 0 # break 返回值始终为 0
return return
@ -312,12 +317,23 @@ check_ram() {
else else
# lsmem最准确但centos7 arm 和alpine不能用 # lsmem最准确但centos7 arm 和alpine不能用
# arm 24g dmidecode 显示少了128m # arm 24g dmidecode 显示少了128m
# arm 24g lshw 显示23BiB
# ec2 t4g arm alpine 用 lsmem 和 dmidecode 都无效，要用 lshw，但结果和free -m一致，其他平台则没问题
install_pkg util-linux install_pkg util-linux
ram_size=$(lsmem -b 2>/dev/null | grep 'Total online memory:' | awk '{ print $NF/1024/1024 }') ram_size=$(lsmem -b 2>/dev/null | grep 'Total online memory:' | awk '{ print $NF/1024/1024 }')
if [ -z $ram_size ]; then if [ -z $ram_size ]; then
install_pkg dmidecode install_pkg dmidecode
ram_size=$(dmidecode -t 17 | grep "Size.*[GM]B" | awk '{if ($3=="GB") s+=$2*1024; else s+=$2} END {print s}') ram_size=$(dmidecode -t 17 | grep "Size.*[GM]B" | awk '{if ($3=="GB") s+=$2*1024; else s+=$2} END {print s}')
fi fi
if [ -z $ram_size ]; then
install_pkg lshw
# 不能忽略 -i，alpine 显示的是 System memory
ram_str=$(lshw -c memory -short | grep -i 'System Memory' | awk '{print $3}')
ram_size=$(grep <<<$ram_str -o '[0-9]*')
grep <<<$ram_str GiB && ram_size=$((ram_size * 1024))
fi
fi fi
case "$distro" in case "$distro" in

2
trans.sh
View File

@ -26,8 +26,10 @@ error() {
} }
add_community_repo() { add_community_repo() {
if ! grep -x 'http.*/community' /etc/apk/repositories; then
alpine_ver=$(cut -d. -f1,2 </etc/alpine-release) alpine_ver=$(cut -d. -f1,2 </etc/alpine-release)
echo http://dl-cdn.alpinelinux.org/alpine/v$alpine_ver/community >>/etc/apk/repositories echo http://dl-cdn.alpinelinux.org/alpine/v$alpine_ver/community >>/etc/apk/repositories
fi
} }
cp() { cp() {