Skip to content

Commit

Permalink
fix bugs and prep 0.6.1 release
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Crowder <adam@adamcrowder.net>
  • Loading branch information
cheeseandcereal committed Jan 14, 2020
1 parent 40386cc commit 4c7e44a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.6.0
v0.6.1
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## v0.6.1

- **Features:**
- Add warning when running on arm64 that support is currently experimental and not yet fully working
- **Bugs:**
- Fix a bug where installer would fail after inputting configuration if dragonchain config folder didn't already exist
- Fix install script for arm64

## v0.6.0

- **Features:**
Expand Down
1 change: 1 addition & 0 deletions cmd/dc-installer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ func main() {
if !(configuration.ARM64 && configuration.Linux) {
fatalLog("Unsupported OS/Architecture")
}
fmt.Println("WARNING!!! ARM64 support is currently experimental and not fully working/supported.")
}
if len(os.Args) > 1 && (os.Args[1] == "-V" || os.Args[1] == "--version" || os.Args[1] == "version") {
fmt.Println(configuration.Version)
Expand Down
7 changes: 7 additions & 0 deletions internal/configuration/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,13 @@ func PromptForUserConfiguration() (*Configuration, error) {
if err != nil {
return nil, err
}
folder, err := credentialFolderPath()
if err != nil {
return nil, err
}
if err := os.MkdirAll(folder, os.ModePerm); err != nil {
return nil, err
}
configFile, err := configFilePath()
if err != nil {
return nil, err
Expand Down
15 changes: 11 additions & 4 deletions scripts/get_installer.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

# Default version (change with new tagged releases)
VERSION="v0.6.0"
VERSION="v0.6.1"

if [ -z "$HOME" ]; then
echo "The \$HOME environment variable must be present"
Expand All @@ -15,8 +15,15 @@ if [ "$OS" != "linux" ] && [ "$OS" != "darwin" ]; then
exit 1
fi

if [ "$(uname -m)" != "x86_64" ]; then
echo "The installer only works on 64 bit machines"
ARCH=""
if [ "$(uname -m)" = "x86_64" ]; then
ARCH="amd64"
fi
if [ "$(uname -m)" = "aarch64" ]; then
ARCH="arm64"
fi
if [ "$ARCH" = "" ]; then
echo "This installer only works for 64 bit cpus (amd64 or arm64)"
exit 1
fi

Expand Down Expand Up @@ -59,7 +66,7 @@ mkdir -p "$HOME/.local/bin/"
# Download the installer if necessary
LOCAL_FILE="$HOME/.local/bin/dc-installer-$VERSION"
if [ ! -f "$LOCAL_FILE" ]; then
DOWNLOAD_URL="https://github.com/dragonchain/dragonchain-installer/releases/download/$VERSION/dc-installer-$OS-amd64"
DOWNLOAD_URL="https://github.com/dragonchain/dragonchain-installer/releases/download/$VERSION/dc-installer-$OS-$ARCH"
echo "Downloading installer at $DOWNLOAD_URL"
if [ "$DL_CMD" = "curl" ]; then
curl -Lf "$DOWNLOAD_URL" -o "$LOCAL_FILE"
Expand Down

0 comments on commit 4c7e44a

Please sign in to comment.