From b5b32bcee816945a3f97a1bb74b983f6335a4307 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Wed, 27 Sep 2023 11:35:30 +0800 Subject: [PATCH] Get cmd result in `netbsd` --- chsrc.c | 12 ++++++------ xy.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chsrc.c b/chsrc.c index 09e4fb4..6e93af0 100644 --- a/chsrc.c +++ b/chsrc.c @@ -776,8 +776,8 @@ os_ubuntu_setsrc (char* option) chsrc_backup ("/etc/apt/sources.list"); - char* arch = xy_getcmd("arch",NULL); - char* cmd; + char* arch = xy_getcmd("arch", NULL); + char* cmd = NULL; if(strncmp(arch, "x86_64", 6)==0) { cmd = xy_strjoin(3, "sed -E -i \'s@https?://.*/ubuntu/?@", source.url, "@g\' /etc/apt/sources.list"); @@ -1031,9 +1031,8 @@ os_arch_setsrc(char* option) chsrc_backup ("/etc/pacman.d/mirrorlist"); bool arch_flag = false; - char* new_file; + char* new_file = NULL; char* arch = xy_getcmd("arch", NULL); - char* cmd; if (strncmp(arch, "x86_64", 6)==0) { arch_flag = true; @@ -1375,8 +1374,9 @@ os_netbsd_setsrc(char* option) chsrc_backup ("/usr/pkg/etc/pkgin/repositories.conf"); - char* arch = xy_getcmd("arch",NULL); - char* version = "cat /etc/os-release | grep \"VERSION=\" | grep -Po \"[8-9].[0-9]+\""; + char* arch = xy_getcmd("arch", NULL); + char* vercmd = "cat /etc/os-release | grep \"VERSION=\" | grep -Po \"[8-9].[0-9]+\""; + char* version = xy_getcmd(vercmd, NULL); char* url = xy_strjoin(5, source.url, arch, "/", version, "/All"); chsrc_overwrite_file (url, "/usr/pkg/etc/pkgin/repositories.conf"); diff --git a/xy.h b/xy.h index 596f028..932a2af 100644 --- a/xy.h +++ b/xy.h @@ -3,7 +3,7 @@ * License : MIT * Authors : Aoran Zeng * Created on : <2023-08-28> - * Last modified : <2023-09-26> + * Last modified : <2023-09-27> * * xy: *