From 0b14dbc272cbeb3603c6a45ed864aa5816721709 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Thu, 10 Mar 2016 14:07:14 -0500
Subject: [PATCH 1/2] Do not skip test/setup just because it has been
 attempted, only when it has succeeded.

---
 Makefile   | 1 +
 test/setup | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index e8e018ae..3bae1fb5 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ all: $(PKG) $(SIG)
 check:
 	shellcheck share/$(NAME)/*.sh
 
+.PHONY: test/opt/rubies
 test/opt/rubies:
 	./test/setup
 
diff --git a/test/setup b/test/setup
index ea7d6e67..5e6312bd 100755
--- a/test/setup
+++ b/test/setup
@@ -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"
 

From 2761c31f9b0b60d139ef9b002b56575376fef5d4 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Thu, 10 Mar 2016 14:07:19 -0500
Subject: [PATCH 2/2] Fix rvm binary paths for debian versions.

---
 test/setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/setup b/test/setup
index 5e6312bd..a1ccaeb6 100755
--- a/test/setup
+++ b/test/setup
@@ -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"