Commit f3f230e4 authored by Joshua Peek's avatar Joshua Peek
Browse files

Merge branch 'master' into ree

Conflicts:
	bin/ruby-build
parents 23ccbd7d 81901adf
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ install_package() {
  extract_package "$package_name"
  cd "$package_name"
  build_package "$package_name" $*
  after_install_package "$package_name"
  cd "$cwd"
}

@@ -65,11 +66,19 @@ build_package_ruby() {
  } >$LOG_PATH 2>&1
}

build_package_copy() {
  cp -R . "$PREFIX_PATH"
}

build_package_ree_installer() {
  { ./installer --auto "$PREFIX_PATH"
  } >$LOG_PATH 2>&1
}

after_install_package() {
  local stub=1
}

usage() {
  echo "usage: ruby-build DEFINITION-PATH INSTALLATION-PREFIX"
  exit 1

versions/jruby-1.6.3

0 → 100644
+17 −0
Original line number Diff line number Diff line
after_install_package() {
  shim_jruby
  remove_windows_files
}

shim_jruby() {
  cd "${PREFIX_PATH}/bin"
  sed -i "" 's/^#!\/bin\/bash/#!\/usr\/bin\/env bash/' jruby
  ln -fs jruby ruby
}

remove_windows_files() {
  cd "$PREFIX_PATH"
  rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh
}

install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" copy