Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow --version to overwrite addon version #62

Merged
merged 5 commits into from
Dec 7, 2020
Merged

Allow --version to overwrite addon version #62

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2edb4e8
Allow --version to overwrite addon version
einschmidt Nov 26, 2020
c5d9c5a
Update builder.sh
einschmidt Nov 26, 2020
0a6b0ed
Update builder.sh
einschmidt Nov 26, 2020
34f161d
Updated variables
einschmidt Dec 1, 2020
4efa1ca
Update builder.sh
einschmidt Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,15 @@ function build_addon() {
name="$(jq --raw-output '.name // empty' "$TARGET/config.json" | sed "s/'//g")"
description="$(jq --raw-output '.description // empty' "$TARGET/config.json" | sed "s/'//g")"
url="$(jq --raw-output '.url // empty' "$TARGET/config.json")"
version="$(jq --raw-output '.version' "$TARGET/config.json")"
raw_image="$(jq --raw-output '.image // empty' "$TARGET/config.json")"
mapfile -t supported_arch < <(jq --raw-output '.arch // empty' "$TARGET/config.json")

# Read version from config.json when VERSION is not set
if [ -n "$VERSION" ]; then
version="$VERSION"
else
version="$(jq --raw-output '.version' "$TARGET/config.json")"
fi

# Check arch
if [[ ! ${supported_arch[*]} =~ ${build_arch} ]]; then
Expand Down