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.

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

MYST-564 Fix config directory in standalone artifacts #283

Merged

Conversation

Projects
None yet
3 participants
@Waldz
Copy link
Member

commented Jul 5, 2018

No description provided.

@Waldz Waldz requested review from tadovas, interro and zolia Jul 5, 2018

@Waldz Waldz requested a review from donce as a code owner Jul 5, 2018

@Waldz Waldz changed the title MYST-564 Release standalone artifacts MYST-564 Fix config directory in standalone artifacts Jul 5, 2018

@Waldz Waldz changed the title MYST-564 Fix config directory in standalone artifacts WIP MYST-564 Fix config directory in standalone artifacts Jul 5, 2018

@Waldz Waldz changed the base branch from master to feature/MYST-566-release-docker Jul 5, 2018

@Waldz Waldz force-pushed the Waldz:feature/MYST-564-release-standalone branch from db80c49 to 717e913 Jul 5, 2018

cp -r "bin/client_package/config" ${DIR_TEMP}/
cp -p ${BINARY} ${DIR_TEMP}/mysterium_client
cp -rp "bin/common_package/" ${DIR_TEMP}/config
cp -rp "bin/client_package/config/${OS}/" ${DIR_TEMP}/config 2>/dev/null || true

# Tarball package directory
tar -zcv -f ${PACKAGE_FILE} -C ${DIR_TEMP} .

This comment has been minimized.

Copy link
@tadovas

tadovas Jul 5, 2018

Member

Zip for windows? :)

This comment has been minimized.

Copy link
@Waldz

Waldz Jul 9, 2018

Author Member

Implemented

@Waldz Waldz changed the base branch from feature/MYST-566-release-docker to master Jul 6, 2018

@Waldz Waldz changed the title WIP MYST-564 Fix config directory in standalone artifacts MYST-564 Fix config directory in standalone artifacts Jul 6, 2018

@Waldz Waldz force-pushed the Waldz:feature/MYST-564-release-standalone branch from 798fe23 to 0c76020 Jul 9, 2018

Waldz added some commits Jul 4, 2018

Simplify namee in tarball package
Signed-off-by: Waldz <valdas@mysterium.network>
Dont fail standalone for Windows
Signed-off-by: Waldz <valdas@mysterium.network>
Add more verbose
Signed-off-by: Waldz <valdas@mysterium.network>
Pack standalone to .zip archive for Windows
Signed-off-by: Waldz <valdas@mysterium.network>

@Waldz Waldz force-pushed the Waldz:feature/MYST-564-release-standalone branch from 0c76020 to d96b010 Jul 9, 2018


# Tarball package directory
tar -zcv -f ${PACKAGE_FILE} -C ${DIR_TEMP} .
if [ "$OS" == "windows" ]; then
PACKAGE_FILE="${DIR_BUILD}/`basename -s .exe ${BINARY}`.zip"

This comment has been minimized.

Copy link
@tadovas

tadovas Jul 10, 2018

Member

👍 windows users happy :)

@tadovas
Copy link
Member

left a comment

LGTM

exit 1
fi
if [ "$OS" != "linux" ] && [ "$OS" != "darwin" ] && [ "$OS" != "windows" ]; then
print_error "OS should be: linux, darwin, windows!"

This comment has been minimized.

Copy link
@zolia

zolia Jul 11, 2018

Member

"OS should be: linux, darwin or windows", would skip "!".

This comment has been minimized.

Copy link
@Waldz

Waldz Jul 11, 2018

Author Member

Improved

exit 1
fi
if [ "$OS" != "linux" ] && [ "$OS" != "darwin" ] && [ "$OS" != "windows" ]; then
print_error "OS should be: linux, darwin, windows!"

This comment has been minimized.

Copy link
@zolia

zolia Jul 11, 2018

Member

"OS should be: linux, darwin or windows", would skip "!".

This comment has been minimized.

Copy link
@Waldz

Waldz Jul 11, 2018

Author Member

Improved

print_error "Missing OS!"
exit 1
fi
if [ "$OS" != "linux" ] && [ "$OS" != "darwin" ] && [ "$OS" != "windows" ]; then

This comment has been minimized.

Copy link
@zolia

zolia Jul 11, 2018

Member

theres also more concise version for this check:
if [[ ! "$OS" =~ ^(linux|darwin|windows)$ ]]; then

This comment has been minimized.

Copy link
@Waldz

Waldz Jul 11, 2018

Author Member

Good one. Improved

Better way to perform in array check in bash
Signed-off-by: Waldz <valdas@mysterium.network>
@zolia

zolia approved these changes Jul 11, 2018

@tadovas
Copy link
Member

left a comment

reLGTMed

@Waldz Waldz merged commit 04bd619 into mysteriumnetwork:master Jul 11, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Waldz Waldz deleted the Waldz:feature/MYST-564-release-standalone branch Jul 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.