From b836b93b39c0b658953e1901a73121a70de6c9b4 Mon Sep 17 00:00:00 2001 From: vietlubu Date: Sun, 14 Jan 2024 11:27:59 +0700 Subject: [PATCH 1/2] Fix sysinfogen.sh get incorrect synctax SYSINFO_CPUCORES --- sysinfogen.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sysinfogen.sh b/sysinfogen.sh index 3c979fb943a..ff9d7401b20 100755 --- a/sysinfogen.sh +++ b/sysinfogen.sh @@ -238,7 +238,7 @@ cat >> "$OUTFILE" << EOF #define SYSINFO_CPU "$( cleanstring "${HERC_CPU}" )" // CPU Cores (Platform-dependent) -#define SYSINFO_CPUCORES ( $( cleanstring "${HERC_CORES}" ) ) +#define SYSINFO_CPUCORES ( "$( cleanstring "${HERC_CORES}" )" ) EOF [ $? -eq 0 ] || do_fail @@ -290,4 +290,3 @@ cat >> "$OUTFILE" << EOF EOF [ $? -eq 0 ] || do_fail - From 8edd893002907fb39aea451d4aa51c182a78f0ce Mon Sep 17 00:00:00 2001 From: vietlubu Date: Tue, 12 Mar 2024 18:29:48 +0700 Subject: [PATCH 2/2] Update get total core for HERC_CORES --- sysinfogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysinfogen.sh b/sysinfogen.sh index ff9d7401b20..401a841a4b2 100755 --- a/sysinfogen.sh +++ b/sysinfogen.sh @@ -190,7 +190,7 @@ case $HERC_PLATFORM in HWDATA="$( system_profiler SPHardwareDataType )" HWDATA_CPU="$( echo "$HWDATA" | grep "Processor Name:" | cut -d: -f2- )" HWDATA_CPUSPEED="$( cleanstring "$( echo "$HWDATA" | grep "Processor Speed:" | cut -d: -f2- )" )" - HERC_CORES="$( echo "$HWDATA" | grep "Total Number of Cores:" | cut -d: -f2- )" + HERC_CORES="$( echo "$HWDATA" | grep "Total Number of Cores:" | cut -d: -f2- | sed -E 's/ *([0-9]+).*/\1/')" HERC_CPU="${HWDATA_CPU} (${HWDATA_CPUSPEED})" fi ;; @@ -238,7 +238,7 @@ cat >> "$OUTFILE" << EOF #define SYSINFO_CPU "$( cleanstring "${HERC_CPU}" )" // CPU Cores (Platform-dependent) -#define SYSINFO_CPUCORES ( "$( cleanstring "${HERC_CORES}" )" ) +#define SYSINFO_CPUCORES ( $( cleanstring "${HERC_CORES}" ) ) EOF [ $? -eq 0 ] || do_fail