Skip to content

Commit

Permalink
Merge pull request #4 from ortus-boxlang/development
Browse files Browse the repository at this point in the history
v1.0.2
  • Loading branch information
lmajano authored Jun 20, 2024
2 parents 6171a72 + 6a33f82 commit b04c7c5
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
# The installer version
VERSION: 1.0.1
VERSION: 1.0.2

jobs:
publish:
Expand All @@ -17,6 +17,7 @@ jobs:
# add write permissions
permissions:
contents: write
checks: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -27,6 +28,11 @@ jobs:
changelogPath: ./changelog.md
tag: v${{ env.VERSION }}

- name: Fix Markdown on Changelog
run: |
npm install -g markdownlint-cli
markdownlint changelog.md --fix
- name: Commit Changelog [unreleased] with latest version
uses: EndBug/[email protected]
with:
Expand Down Expand Up @@ -94,6 +100,7 @@ jobs:
# add write permissions
permissions:
contents: write
checks: write
steps:
- name: Checkout Development Repository
uses: actions/checkout@v4
Expand All @@ -107,9 +114,9 @@ jobs:

- name: Copy Changelog
run: |
cp .tmp/changelog.md changelog.md
cp -vf .tmp/changelog.md changelog.md
- name: Commit Version Bump
- name: Commit
uses: EndBug/[email protected]
with:
author_name: Github Actions
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"no-duplicate-header" : {
"siblings_only" : true
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ You can also install any version of BoxLang by passing the version number as an
## Usage

```bash
bash <(curl -s https://boxlang.ortus.io/install)
/bin/bash -c "$(curl -fsSL https://downloads.ortussolutions.com/ortussolutions/boxlang/install-boxlang.sh)"
```

## Contributing
Expand Down
6 changes: 4 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.0.1] - 2024-05-28
- Remove old zips upon first install
- Updated release build
- Java 21 as the new standard

## [1.0.1] - 2024-May-28

Expand All @@ -24,7 +26,7 @@ The installer scripts are now installed to: `/usr/local/bin`. So you can reuse t

### Added

- Initial release
- Initial release

[Unreleased]: https://github.com/ortus-boxlang/boxlang-quick-installer/compare/v1.0.1...HEAD

Expand Down
14 changes: 2 additions & 12 deletions src/install-boxlang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,13 @@ main() {
local DOWNLOAD_URL_MINISERVER=${VERSIONED_URL_MINISERVER}
fi

# Check java exists
command -v java >/dev/null 2>&1 || {
echo "Error: Java is not installed and we need it for BoxLang to work. Please download JDK 17+ from https://adoptopenjdk.net/ and install it."
exit 1
}

# Check java version is 17 or higher
local JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
if [ "${JAVA_VERSION}" \< "21" ]; then
echo "Error: Java 21 or higher is required to run BoxLang"
exit 1
fi

# Check curl exists
command -v curl >/dev/null 2>&1 || {
echo "Error: curl is not installed and we need it in order for the quick installer to work"
exit 1
}

# Tell them where we will install
printf "${GREEN}"
echo ''
Expand All @@ -90,10 +78,12 @@ main() {
mkdir -p /usr/local/lib

# Download
rm -f /tmp/boxlang.zip
env curl -Lk -o /tmp/boxlang.zip "${DOWNLOAD_URL}" || {
printf "Error: Download of BoxLang® binary failed\n"
exit 1
}
rm -f /tmp/boxlang-miniserver.zip
env curl -Lk -o /tmp/boxlang-miniserver.zip "${DOWNLOAD_URL_MINISERVER}" || {
printf "Error: Download of BoxLang® MiniServer binary failed\n"
exit 1
Expand Down

0 comments on commit b04c7c5

Please sign in to comment.