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

Jump to bottom

fix(installer) Mac OSX artefacts do not use zip anymore #763

Merged
merged 2 commits into from
Aug 8, 2022
Merged

fix(installer) Mac OSX artefacts do not use zip anymore #763

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a236a7e
fix(installer) Mac OSX artefacts do not use zip anymore
john-scalingo Aug 8, 2022
705f1f4
refactor(install): remove switch case
EtienneM Aug 8, 2022
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
26 changes: 6 additions & 20 deletions dists/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,11 @@ main() {
uname -a | grep -qi 'Darwin' ; is_darwin=$?

os=$(uname -s | tr '[A-Z]' '[a-z]')
ext=zip
case $os in
linux)
ext='tar.gz'
;;
darwin)
;;
*)
echo "Unsupported OS: $(uname -s)"
exit 1
;;
esac
ext='tar.gz'
EtienneM marked this conversation as resolved.
Show resolved Hide resolved
if [ "$os" != "linux" ] && [ "$os" != "darwin" ]; then
echo "Unsupported OS: $(uname -s)"
exit 1
fi

arch=$(uname -m)
case $arch in
Expand Down Expand Up @@ -122,14 +115,7 @@ main() {
fi
echo "DONE"
status "Extracting... "
case $ext in
zip)
unzip -d "${tmpdir}" "${tmpdir}/${archive_name}"
;;
tar.gz)
tar -C "${tmpdir}" -x -f "${tmpdir}/${archive_name}"
;;
esac
tar -C "${tmpdir}" -x -f "${tmpdir}/${archive_name}"
johnsudaar marked this conversation as resolved.
Show resolved Hide resolved

exe_path=${tmpdir}/${dirname}/scalingo
if [ ! -f "$exe_path" ]; then
Expand Down