github-mirror/chsrc
2
0
Fork 0
mirror of https://github.com/RubyMetric/chsrc.git synced 2024-12-29 18:24:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Debian, Rocky version detection

Browse Source
This commit is contained in:
happy game 2024-12-12 11:20:42 +08:00
parent 7c8d64adbc
commit 50e6e2da6e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/recipe/os/APT/common.h
View File

@ -2,10 +2,10 @@
* SPDX-License-Identifier: GPL-3.0-or-later
* -------------------------------------------------------------
* File Authors : Aoran Zeng <ccmywish@qq.com>
* Contributors : Nil Null <nil@null.org>
* Contributors : happy game <happygame1024@gmail.com>
* |
* Created On : <2024-06-14>
* Last Modified : <2024-11-08>
* Last Modified : <2024-12-12>
* ------------------------------------------------------------*/
#define OS_Apt_SourceList "/etc/apt/sources.list"
@ -64,12 +64,9 @@ ensure_apt_sourcelist (int debian_type)
char *codename = xy_run ("sed -nr 's/VERSION_CODENAME=(.*)/\\1/p' " ETC_OS_RELEASE, 0, NULL);
codename = xy_str_delete_suffix (codename, "\n");
char *version_id = xy_run ("sed -nr 's/VERSION_ID=(.*)/\\1/p' " ETC_OS_RELEASE, 0, NULL);
char *version_id = xy_run ("sed -nr 's/VERSION_ID=\"(.*)\"/\\1/p' " ETC_OS_RELEASE, 0, NULL);
version_id = xy_str_delete_suffix (codename, "\n");
// 得到的结果是带双引号的，需要去掉，如 "12"
version_id = xy_str_delete_prefix (version_id, "\"");
version_id = xy_str_delete_suffix (version_id, "\"");
double version = atof (version_id);

7
src/recipe/os/YUM/Rocky-Linux.c
View File

@ -2,9 +2,10 @@
* SPDX-License-Identifier: GPL-3.0-or-later
* -------------------------------------------------------------
* File Authors : Aoran Zeng <ccmywish@qq.com>
* Contributors : Nil Null <nil@null.org>
* Contributors : happy game <happygame1024@gmail.com>
* |
* Created On : <2023-09-24>
* Last Modified : <2024-08-22>
* Last Modified : <2024-12-12>
* ------------------------------------------------------------*/
/**
@ -37,7 +38,7 @@ os_rockylinux_setsrc (char *option)
chsrc_yield_source_and_confirm (os_rockylinux);
char *version_str = xy_run ("sed -nr 's/ROCKY_SUPPORT_PRODUCT_VERSION=(.*)/\\1/p' " ETC_OS_RELEASE, 0, NULL);
char *version_str = xy_run ("sed -nr 's/ROCKY_SUPPORT_PRODUCT_VERSION=\"(.*)\"/\\1/p' " ETC_OS_RELEASE, 0, NULL);
version_str = xy_str_delete_suffix (version_str, "\n");
double version = atof (version_str);