diff --git a/Makefile b/Makefile index 1ceef1a..e519df9 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,16 @@ TEMP_DIR := $(shell mktemp -d) WORK_DIR := $(TEMP_DIR)/TA-unix -TAR_FILE := ./ta-for-unix-and-linux-`head -n1 VERSION`.tgz +VERSION := $(shell head -n1 VERSION) +TAR_FILE := ./ta-for-unix-and-linux-$(VERSION).tgz all: release +updateversion: +ifndef NEWVERSION + $(error NEWVERSION is not specified. Usage make NEWVERSION= updateversion) +endif + sed -ri "s/$(VERSION)/$(NEWVERSION)/g" app.manifest default/app.conf VERSION + release: mkdir -p $(WORK_DIR) cp -R . $(WORK_DIR)/ diff --git a/VERSION b/VERSION index 9f50d06..c705dce 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -9.2.0.2 -9.2.0.2 +9.2.0.3 +9.2.0.3 diff --git a/app.manifest b/app.manifest index da16fa8..6ef5050 100644 --- a/app.manifest +++ b/app.manifest @@ -29,7 +29,7 @@ "id": { "group": null, "name": "TA-nix", - "version": "9.2.0.2" + "version": "9.2.0.3" }, "license": { "name": "Splunk Software License Agreement", diff --git a/bin/version.sh b/bin/version.sh index 7edd86f..e37812e 100755 --- a/bin/version.sh +++ b/bin/version.sh @@ -21,6 +21,8 @@ if [ "$KERNEL" = "Linux" ] ; then [ -r /etc/debian_version ] && grep -Eq "^[0-9.]+$" /etc/debian_version && os_release=$(cat /etc/debian_version) [ "$BUILD_ID" = "rolling" ] && os_release=rolling [ "$BUILD_ID" = "rolling" ] && os_version=rolling + 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/") 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" elif [ "$KERNEL" = "Darwin" ] ; then diff --git a/default/app.conf b/default/app.conf index ed1bf0e..388abc4 100644 --- a/default/app.conf +++ b/default/app.conf @@ -17,7 +17,7 @@ docs_section_override = AddOns:released [launcher] author = Michael Erdely -version = 9.2.0.2 +version = 9.2.0.3 description = Technical Add-on for Unix and Linux #[package] @@ -26,5 +26,5 @@ description = Technical Add-on for Unix and Linux [id] name = TA-unix -version = 9.2.0.2 +version = 9.2.0.3 diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index 9bb7cde..296d838 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -1,5 +1,12 @@ # Technical Add-on for Unix and Linux +## Version 9.2.0.3 + +Fix bug in 9.2.0.2 + +* Add code I forgot for machine_arch for Linux +* Add Makefile to make making releases easier + ## Version 9.2.0.2 Improvements for version.sh