Skip to content

debian wheezy/jessie use major version and pass tests #331

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 5 commits into
base: master
Choose a base branch
from
Open

debian wheezy/jessie use major version and pass tests #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61c3fa3
issue #327
brettrann Mar 19, 2015
6d5f7e7
issue #327 removing jessie_sid - 8 hack. linked upstream now.
Mar 24, 2015
2854906
Merge remote-tracking branch 'upstream/master'
brettrann Mar 27, 2015
c261645
fix tabs
May 7, 2015
4f9d088
Merge remote-tracking branch 'upstream/master'
May 7, 2015
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
2 changes: 1 addition & 1 deletion test/chruby_exec_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function test_chruby_exec()

function test_chruby_exec_with_version()
{
local output=$(chruby-exec --version)
local output="$(chruby-exec --version)"

assertEquals "did not output the correct version" \
"chruby version $CHRUBY_VERSION" \
Expand Down
8 changes: 4 additions & 4 deletions test/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
function log() {
if [[ -t 1 ]]; then
printf "%b>>>%b %b%s%b\n" "\x1b[1m\x1b[32m" "\x1b[0m" \
"\x1b[1m\x1b[37m" "$1" "\x1b[0m"
"\x1b[1m\x1b[37m" "$1" "\x1b[0m"
else
printf ">>> %s\n" "$1"
fi
Expand All @@ -14,7 +14,7 @@ function log() {
function error() {
if [[ -t 1 ]]; then
printf "%b!!!%b %b%s%b\n" "\x1b[1m\x1b[31m" "\x1b[0m" \
"\x1b[1m\x1b[37m" "$1" "\x1b[0m" >&2
"\x1b[1m\x1b[37m" "$1" "\x1b[0m" >&2
else
printf "!!! %s\n" "$1" >&2
fi
Expand Down Expand Up @@ -150,9 +150,9 @@ function detect_system() {
}

detect_system || fail "Cannot auto-detect system type"
[[ "$system_name" == "unknown" ]] && fail "Could not detect system name"
[[ "$system_name" == "unknown" ]] && fail "Could not detect system name"
[[ "$system_version" == "unknown" ]] && fail "Could not detect system version"
[[ "$system_arch" == "unknown" ]] && fail "Could not detect system arch"
[[ "$system_arch" == "unknown" ]] && fail "Could not detect system arch"

test_ruby_archive="$test_ruby_engine-$test_ruby_version-p$test_ruby_patchlevel.tar.bz2"
test_ruby_url="http://rvm.io/binaries/$system_name/$system_version/$system_arch/$test_ruby_archive"
Expand Down