Skip to content

make tests pass on debian jessie #360

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make tests pass on debian jessie #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b14dbc
Do not skip test/setup just because it has been attempted, only when …
tomclegg Mar 10, 2016
2761c31
Fix rvm binary paths for debian versions.
tomclegg Mar 10, 2016
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ all: $(PKG) $(SIG)
check:
shellcheck share/$(NAME)/*.sh

.PHONY: test/opt/rubies
test/opt/rubies:
./test/setup

Expand Down
9 changes: 7 additions & 2 deletions test/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ function detect_system() {
)"
elif [[ -f /etc/debian_version ]]; then
system_name="debian"
system_version="$(awk -F. '{print $1"."$2}' /etc/debian_version)"
system_version="$(awk -F. '{print $1}' /etc/debian_version)"
system_arch="$( dpkg --print-architecture )"
elif [[ -f /etc/os-release ]] && [[ "$(< /etc/os-release)" == *"ID=debian"* ]]; then
system_name="debian"
system_version="$(awk -F'=' '$1=="VERSION_ID"{gsub(/"/,"");print $2}' /etc/os-release | awk -F. '{print $1"."$2}')" #'
system_version="$(awk -F'=' '$1=="VERSION_ID"{gsub(/"/,"");print $2}' /etc/os-release | awk -F. '{print $1}')" #'
system_arch="$( dpkg --print-architecture )"
elif [[ -f /etc/fedora-release ]]; then
system_name="fedora"
Expand Down Expand Up @@ -161,6 +161,11 @@ test_ruby_root="$test_ruby_engine-$test_ruby_version"
mkdir -p "$PREFIX/opt/rubies"
cd "$PREFIX/opt/rubies"

if [[ -d "$test_ruby_root" ]] && ! [[ -e "$test_ruby_archive" ]]; then
log "$test_ruby_root already extracted and cleaned up."
exit
fi

log "Downloading $test_ruby_url ..."
download "$test_ruby_url" "$test_ruby_archive" || fail "Download failed"

Expand Down