undo accidental changes to master
This reverts commits5b4b7223c2
,fe2933519c
, and9f2cfbaed0
. This gets us back to11ea991577
.
This commit is contained in:
parent
5b4b7223c2
commit
97c386a836
1 changed files with 2 additions and 3 deletions
|
@ -25,9 +25,8 @@ Dir.chdir Pathname.new(__FILE__).realpath + "../.."
|
||||||
|
|
||||||
# Auto-update code. This is done as early as possible so that changes
|
# Auto-update code. This is done as early as possible so that changes
|
||||||
# to boxen support code or dependencies can be grabbed.
|
# to boxen support code or dependencies can be grabbed.
|
||||||
NO_PULL_ARGS = %w[--no-pull -h -? --help] + [/-service/]
|
|
||||||
unless ENV["BOXEN_NO_PULL"] ||
|
unless ENV["BOXEN_NO_PULL"] || ARGV.include?("--no-pull")
|
||||||
ARGV.any? { |arg| NO_PULL_ARGS.any? { |no| arg.match(no) } }
|
|
||||||
quietly = "> /dev/null 2>&1"
|
quietly = "> /dev/null 2>&1"
|
||||||
|
|
||||||
if system("which git > /dev/null") && File.directory?(".git") \
|
if system("which git > /dev/null") && File.directory?(".git") \
|
||||||
|
|
Loading…
Reference in a new issue