diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..359a5b9 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.0.0 \ No newline at end of file diff --git a/build-cli.sh b/build-cli.sh index c851b13..75a130f 100755 --- a/build-cli.sh +++ b/build-cli.sh @@ -8,15 +8,14 @@ OUTPUT_DIR="../dist" function gobuild { printf -- "-> ${GOOS}\t${GOARCH}\t${OUTPUT_FILE} " - go build -ldflags="-X 'main.Version=${VERSION}' -X 'github.com/ChaoticByte/lurch-dl/core.Version=${CORE_VERSION}'" -o "${OUTPUT_DIR}/${OUTPUT_FILE}" && printf "\t✔\n" + go build -ldflags="-X 'github.com/ChaoticByte/lurch-dl/core.Version=${VERSION}'" -o "${OUTPUT_DIR}/${OUTPUT_FILE}" && printf "\t✔\n" } -read -r CORE_VERSION < "${CORE_DIR}/VERSION" - -cd "${WORKDIR}" read -r VERSION < ./VERSION -NAME_BASE="lurchdl-cli_${VERSION}_core${CORE_VERSION}" +cd "${WORKDIR}" + +NAME_BASE="lurch-dl_v${VERSION}" echo "Building ${NAME_BASE} into ${OUTPUT_DIR}" @@ -30,5 +29,5 @@ GOOS=linux GOARCH=arm64 OUTPUT_FILE=${NAME_BASE}_linux_arm64 gobuild cd .. -printf -- "Creating tag cli${VERSION}_core${CORE_VERSION}" -git tag -f "cli${VERSION}_core${CORE_VERSION}" && printf "\t\t✔\n" +printf -- "Creating version tag" +git tag -f "v${VERSION}" -m "" && printf "\t\t✔\n" diff --git a/cli/VERSION b/cli/VERSION index 10bf840..359a5b9 100644 --- a/cli/VERSION +++ b/cli/VERSION @@ -1 +1 @@ -2.0.1 \ No newline at end of file +2.0.0 \ No newline at end of file diff --git a/cli/cli.go b/cli/cli.go index 526b7a2..f588bd3 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -68,7 +68,7 @@ lurch-dl --url string The url to the video IP address might get banned from the servers. default: 10.0 -Version: cli` + Version + "_core" + core.Version) +Version: ` + core.Version) } func CliParseArguments() (core.Arguments, CliOnlyArguments, error) { diff --git a/cli/version.go b/cli/version.go deleted file mode 100644 index 23bec87..0000000 --- a/cli/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package main - -var Version = "dev" diff --git a/core/VERSION b/core/VERSION deleted file mode 100644 index 8cfbc90..0000000 --- a/core/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.1.1 \ No newline at end of file