study/chsrc
1
0
Fork 0
mirror of https://github.com/RubyMetric/chsrc synced 2025-12-27 04:59:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove xy_run() last parameter

Browse Source
This commit is contained in:
Aoran Zeng
2024-12-14 09:14:11 +08:00
parent 252a64924f
commit be3982bbff
10 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,10 +61,10 @@ ensure_apt_sourcelist (int debian_type)
}
// 反向引用需要escape一下
char *codename = xy_run ("sed -nr 's/VERSION_CODENAME=(.*)/\\1/p' " ETC_OS_RELEASE, 0, NULL);
char *codename = xy_run ("sed -nr 's/VERSION_CODENAME=(.*)/\\1/p' " ETC_OS_RELEASE, 0);
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);
version_id = xy_str_delete_suffix (codename, "\n");

2
src/recipe/os/BSD/NetBSD.c
View File

@@ -53,7 +53,7 @@ os_netbsd_setsrc (char *option)
char *arch = chsrc_get_cpuarch ();
char *vercmd = "cat /etc/os-release | grep \"VERSION=\" | grep -Po \"[8-9].[0-9]+\"";
char *version = xy_run (vercmd, 0, NULL);
char *version = xy_run (vercmd, 0);
char *url = xy_strjoin (5, source.url, arch, "/", version, "/All");
chsrc_overwrite_file (url, "/usr/pkg/etc/pkgin/repositories.conf");

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

@@ -38,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);
version_str = xy_str_delete_suffix (version_str, "\n");
double version = atof (version_str);