aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-11-20 10:42:54 +0200
committerMarc Englund <marc@vaadin.com>2012-11-20 10:42:54 +0200
commitee80691d45e1333d233fb675df89ac0260218124 (patch)
treedd3aa64a9263ca51a9a729989db14f1835ce73ed
parentb1e30ac14f4e885d993a77e3ad077daf2a4867ce (diff)
downloadvaadin-framework-ee80691d45e1333d233fb675df89ac0260218124.tar.gz
vaadin-framework-ee80691d45e1333d233fb675df89ac0260218124.zip
SassCompiler finds input in a better way, fixes #10299
Change-Id: I56c6a45008e072313f7be6f700f25df228287271
-rw-r--r--theme-compiler/src/com/vaadin/sass/SassCompiler.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/SassCompiler.java b/theme-compiler/src/com/vaadin/sass/SassCompiler.java
index e6ac31b865..07d6eb01f1 100644
--- a/theme-compiler/src/com/vaadin/sass/SassCompiler.java
+++ b/theme-compiler/src/com/vaadin/sass/SassCompiler.java
@@ -25,14 +25,20 @@ public class SassCompiler {
public static void main(String[] args) throws Exception {
String input = null;
String output = null;
- if (args.length == 0) {
+ if (args.length < 1 || args.length > 2) {
System.out
.println("usage: SassCompile <scss file to compile> <css file to write>");
return;
- } else if (args.length == 1) {
- input = args[0];
- } else {
- input = args[0];
+ }
+
+ File in = new File(args[0]);
+ if (!in.canRead()) {
+ System.err.println(in.getCanonicalPath() + " could not be read!");
+ return;
+ }
+ input = in.getCanonicalPath();
+
+ if (args.length == 2) {
output = args[1];
}