mike/TA-unix
1
0
Fork 0
Code Issues Pull requests Projects Releases 15 Packages Wiki Activity Actions

Make distro_name work everywhere

Browse source 
* For MacOS, print MacOS for distro_name
* For others, print $KERNEL for distro_name
This commit is contained in:
Michael Erdely 2025-01-11 15:07:24 -05:00
parent cb7f7785c8
commit 5e766d84d5
Signed by: mike
SSH key fingerprint: SHA256:ukbnfrRMaRYlBZXENtBTyO2jLnql5AA5m+SzZCfYQe0
5 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
VERSION
View file

@ -1,2 +1,2 @@
9.2.0.3 9.2.0.4
9.2.0.3 9.2.0.4

2
app.manifest
View file

@ -29,7 +29,7 @@
"id": { "id": {
"group": null, "group": null,
"name": "TA-nix", "name": "TA-nix",
"version": "9.2.0.3" "version": "9.2.0.4"
}, },
"license": { "license": {
"name": "Splunk Software License Agreement", "name": "Splunk Software License Agreement",

27
bin/version.sh
View file

@ -15,6 +15,7 @@ if [ "$KERNEL" = "Linux" ] ; then
machine_arch=$(uname -p) machine_arch=$(uname -p)
os_release=$(uname -r) os_release=$(uname -r)
os_version=$(uname -v) os_version=$(uname -v)
distro_name=Linux
[ -n "$NAME" ] && distro_name=$NAME [ -n "$NAME" ] && distro_name=$NAME
[ -n "$VERSION_ID" ] && os_release=$VERSION_ID [ -n "$VERSION_ID" ] && os_release=$VERSION_ID
[ -n "$VERSION_ID" ] && os_version=$VERSION_ID [ -n "$VERSION_ID" ] && os_version=$VERSION_ID
@ -24,48 +25,48 @@ if [ "$KERNEL" = "Linux" ] ; then
which dpkg > /dev/null 2>&1 && machine_arch=$(dpkg --print-architecture) which dpkg > /dev/null 2>&1 && machine_arch=$(dpkg --print-architecture)
[ "$NAME" = "Arch Linux" -o "$NAME" = "Arch Linux ARM" ] && machine_arch=$(uname -m | sed -r "s/(armv7l|aarch64)/arm64/;s/x86_64/amd64/") [ "$NAME" = "Arch Linux" -o "$NAME" = "Arch Linux ARM" ] && machine_arch=$(uname -m | sed -r "s/(armv7l|aarch64)/arm64/;s/x86_64/amd64/")
CMD="eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; echo $machine_arch; echo $os_release; echo $os_version; echo $distro_name" CMD="eval date ; echo $distro_name ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; echo $machine_arch; echo $os_release; echo $os_version"
elif [ "$KERNEL" = "Darwin" ] ; then elif [ "$KERNEL" = "Darwin" ] ; then
assertHaveCommand date assertHaveCommand date
assertHaveCommand uname assertHaveCommand uname
assertHaveCommand sw_vers assertHaveCommand sw_vers
os_release=$(sw_vers --productVersion) os_release=$(sw_vers --productVersion)
CMD="eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p; echo $os_release; echo $os_release" CMD="eval date ; echo MacOS ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p; echo $os_release; echo $os_release"
elif [ "$KERNEL" = "SunOS" ] [ "$KERNEL" = "FreeBSD" ] ; then elif [ "$KERNEL" = "SunOS" ] [ "$KERNEL" = "FreeBSD" ] ; then
assertHaveCommand date assertHaveCommand date
assertHaveCommand uname assertHaveCommand uname
CMD='eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p' CMD='eval date ; echo $KERNEL ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p;'
elif [ "$KERNEL" = "HP-UX" ] ; then elif [ "$KERNEL" = "HP-UX" ] ; then
# HP-UX lacks -p switch. # HP-UX lacks -p switch.
assertHaveCommand date assertHaveCommand date
assertHaveCommand uname assertHaveCommand uname
CMD='eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v' CMD='eval date ; echo HP-UX ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v'
elif [ "$KERNEL" = "AIX" ] ; then elif [ "$KERNEL" = "AIX" ] ; then
# AIX uses oslevel for version and release switch. # AIX uses oslevel for version and release switch.
assertHaveCommand date assertHaveCommand date
assertHaveCommand uname assertHaveCommand uname
CMD='eval date ; eval uname -m ; eval oslevel -r ; eval uname -s ; eval oslevel -s' CMD='eval date ; echo AIX ; eval uname -m ; eval oslevel -r ; eval uname -s ; eval oslevel -s'
fi fi
# Get the date. # Get the date.
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_0='NR==1 {DATE=$0}' PARSE_0='NR==1 {DATE=$0}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_1='NR==2 {MACH_HW_NAME="machine_hardware_name=\"" $0 "\""}' PARSE_1='NR==2 {DISTRO="distro_name=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_2='NR==3 {OS_REL="os_release=\"" $0 "\"";KERN_REL="kernel_release=\"" $0 "\""}' PARSE_2='NR==3 {MACH_HW_NAME="machine_hardware_name=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_3='NR==4 {OS_NAME="os_name=\"" $0 "\""}' PARSE_3='NR==4 {OS_REL="os_release=\"" $0 "\"";KERN_REL="kernel_release=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_4='NR==5 {OS_VER="os_version=\"" $0 "\"";KERN_VER="kernel_version=\"" $0 "\""}' PARSE_4='NR==5 {OS_NAME="os_name=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_5='NR==6 {MACH_ARCH_NAME="machine_architecture_name=\"" $0 "\""}' PARSE_5='NR==6 {OS_VER="os_version=\"" $0 "\"";KERN_VER="kernel_version=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_6='NR==7 {OS_REL="os_release=\"" $0 "\""}' PARSE_6='NR==7 {MACH_ARCH_NAME="machine_architecture_name=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_7='NR==8 {OS_VER="os_version=\"" $0 "\""}' PARSE_7='NR==8 {OS_REL="os_release=\"" $0 "\""}'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
PARSE_8='NR==9 {DISTRO="distro_name=\"" $0 "\""}' PARSE_8='NR==9 {OS_VER="os_version=\"" $0 "\""}'
MASSAGE="$PARSE_0 $PARSE_1 $PARSE_2 $PARSE_3 $PARSE_4 $PARSE_5 $PARSE_6 $PARSE_7 $PARSE_8" MASSAGE="$PARSE_0 $PARSE_1 $PARSE_2 $PARSE_3 $PARSE_4 $PARSE_5 $PARSE_6 $PARSE_7 $PARSE_8"

4
default/app.conf
View file

@ -17,7 +17,7 @@ docs_section_override = AddOns:released
[launcher] [launcher]
author = Michael Erdely author = Michael Erdely
version = 9.2.0.3 version = 9.2.0.4
description = Technical Add-on for Unix and Linux description = Technical Add-on for Unix and Linux
#[package] #[package]
@ -26,5 +26,5 @@ description = Technical Add-on for Unix and Linux
[id] [id]
name = TA-unix name = TA-unix
version = 9.2.0.3 version = 9.2.0.4

11
docs/ReleaseNotes.md
View file

@ -1,9 +1,20 @@
# Technical Add-on for Unix and Linux # Technical Add-on for Unix and Linux
## Version 9.2.0.4
Make distro_name work everywhere
Changes:
* For MacOS, print MacOS for distro_name
* For others, print $KERNEL for distro_name
## Version 9.2.0.3 ## Version 9.2.0.3
Fix bug in 9.2.0.2 Fix bug in 9.2.0.2
Changes:
* Add code I forgot for machine_arch for Linux * Add code I forgot for machine_arch for Linux
* Add Makefile to make making releases easier * Add Makefile to make making releases easier