mirror of
https://github.com/mistergibson/radio.git
synced 2026-09-08 22:09:51 -07:00
tweaks
This commit is contained in:
parent
6250104ff5
commit
8a7b25c8be
2 changed files with 10 additions and 4 deletions
|
|
@ -15,12 +15,15 @@
|
||||||
# Gem path bootstrap: pin GEM_HOME/GEM_PATH before any require so the script
|
# Gem path bootstrap: pin GEM_HOME/GEM_PATH before any require so the script
|
||||||
# finds its gems regardless of how it was launched (sudo strips them by
|
# finds its gems regardless of how it was launched (sudo strips them by
|
||||||
# default via env_reset). Derived from this file's own location so the
|
# default via env_reset). Derived from this file's own location so the
|
||||||
# scripts are relocatable. Guards prevent overriding an explicit environment.
|
# scripts are relocatable. We PREPEND our .gems dir to the existing GEM_PATH
|
||||||
|
# rather than replacing it, so JRuby's shared/stdlib path stays reachable.
|
||||||
|
# Guards prevent overriding an explicit environment.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
SCRIPT_DIR = File.expand_path(File.dirname(__FILE__))
|
SCRIPT_DIR = File.expand_path(File.dirname(__FILE__))
|
||||||
GEMS_DIR = File.join(SCRIPT_DIR, ".gems")
|
GEMS_DIR = File.join(SCRIPT_DIR, ".gems")
|
||||||
ENV["GEM_HOME"] = GEMS_DIR unless ENV["GEM_HOME"]
|
ENV["GEM_HOME"] = GEMS_DIR unless ENV["GEM_HOME"]
|
||||||
ENV["GEM_PATH"] = GEMS_DIR unless ENV["GEM_PATH"]
|
_existing_gem_path = ENV["GEM_PATH"].to_s.split(":").reject(&:empty?)
|
||||||
|
ENV["GEM_PATH"] = ([GEMS_DIR] + _existing_gem_path).uniq.join(":")
|
||||||
Gem.paths = { "GEM_HOME" => ENV["GEM_HOME"], "GEM_PATH" => ENV["GEM_PATH"] }
|
Gem.paths = { "GEM_HOME" => ENV["GEM_HOME"], "GEM_PATH" => ENV["GEM_PATH"] }
|
||||||
|
|
||||||
require "sequel"
|
require "sequel"
|
||||||
|
|
|
||||||
|
|
@ -11,12 +11,15 @@
|
||||||
# Gem path bootstrap: pin GEM_HOME/GEM_PATH before any require so the script
|
# Gem path bootstrap: pin GEM_HOME/GEM_PATH before any require so the script
|
||||||
# finds its gems regardless of how it was launched (sudo strips them by
|
# finds its gems regardless of how it was launched (sudo strips them by
|
||||||
# default via env_reset). Derived from this file's own location so the
|
# default via env_reset). Derived from this file's own location so the
|
||||||
# scripts are relocatable. Guards prevent overriding an explicit environment.
|
# scripts are relocatable. We PREPEND our .gems dir to the existing GEM_PATH
|
||||||
|
# rather than replacing it, so JRuby's shared/stdlib path stays reachable.
|
||||||
|
# Guards prevent overriding an explicit environment.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
SCRIPT_DIR = File.expand_path(File.dirname(__FILE__))
|
SCRIPT_DIR = File.expand_path(File.dirname(__FILE__))
|
||||||
GEMS_DIR = File.join(SCRIPT_DIR, ".gems")
|
GEMS_DIR = File.join(SCRIPT_DIR, ".gems")
|
||||||
ENV["GEM_HOME"] = GEMS_DIR unless ENV["GEM_HOME"]
|
ENV["GEM_HOME"] = GEMS_DIR unless ENV["GEM_HOME"]
|
||||||
ENV["GEM_PATH"] = GEMS_DIR unless ENV["GEM_PATH"]
|
_existing_gem_path = ENV["GEM_PATH"].to_s.split(":").reject(&:empty?)
|
||||||
|
ENV["GEM_PATH"] = ([GEMS_DIR] + _existing_gem_path).uniq.join(":")
|
||||||
Gem.paths = { "GEM_HOME" => ENV["GEM_HOME"], "GEM_PATH" => ENV["GEM_PATH"] }
|
Gem.paths = { "GEM_HOME" => ENV["GEM_HOME"], "GEM_PATH" => ENV["GEM_PATH"] }
|
||||||
|
|
||||||
require "sequel"
|
require "sequel"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue