Update build-packages.sh

Mikrz · web-flow · commit e4024a5f407d · 2024-11-11T16:34:16.000-05:00
diff --git a/build-packages.sh b/build-packages.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-<<<<<<< Updated upstream
 TAG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 OUT_VERSION=$(echo $TAG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
 echo $TAG_VERSION

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-<<<<<<< Updated upstream`
`3`	`2`	`TAG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9]..")`
`4`	`3`	`OUT_VERSION=$(echo $TAG_VERSION \| sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')`
`5`	`4`	`echo $TAG_VERSION`