diff --git a/src/recipe/os/APT/common.h b/src/recipe/os/APT/common.h index dfd7cf9..a812113 100644 --- a/src/recipe/os/APT/common.h +++ b/src/recipe/os/APT/common.h @@ -21,7 +21,7 @@ #define OS_Ubuntu_SourceList_DEB822 "/etc/apt/sources.list.d/ubuntu.sources" -#define ETC_os_release "/etc/os-release" +#define ETC_OS_RELEASE "/etc/os-release" #define OS_Is_Debian_Literally 1 #define OS_Is_Ubuntu 2 @@ -58,10 +58,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, 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"); double version = atof (version_id); diff --git a/src/recipe/os/YUM/Rocky-Linux.c b/src/recipe/os/YUM/Rocky-Linux.c index 1cb8641..ae0a8f1 100644 --- a/src/recipe/os/YUM/Rocky-Linux.c +++ b/src/recipe/os/YUM/Rocky-Linux.c @@ -37,7 +37,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);