Skip to content

Commit 1deea29

Browse files
committed
Make sass work when symlinked by encap.
1 parent d8ae9b1 commit 1deea29

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

bin/sass

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
# The command line Sass parser.
33

44
THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
5-
require File.dirname(THIS_FILE) + '/../lib/sass'
5+
begin
6+
require File.dirname(THIS_FILE) + '/../lib/sass'
7+
rescue LoadError
8+
require 'sass'
9+
end
610
require 'sass/exec'
711

812
opts = Sass::Exec::Sass.new(ARGV)

bin/sass-convert

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/usr/bin/env ruby
22

33
THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
4-
require File.dirname(THIS_FILE) + '/../lib/sass'
4+
begin
5+
require File.dirname(THIS_FILE) + '/../lib/sass'
6+
rescue LoadError
7+
require 'sass'
8+
end
59
require 'sass/exec'
610

711
opts = Sass::Exec::SassConvert.new(ARGV)

bin/scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
# The command line Sass parser.
33

44
THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
5-
require File.dirname(THIS_FILE) + '/../lib/sass'
5+
begin
6+
require File.dirname(THIS_FILE) + '/../lib/sass'
7+
rescue LoadError
8+
require 'sass'
9+
end
610
require 'sass/exec'
711

812
opts = Sass::Exec::Scss.new(ARGV)

0 commit comments

Comments
 (0)