Permalink
Browse files

default config file should be config.rb

  • Loading branch information...
1 parent 08df4d1 commit c6addf7b6900ef16ba2f71844cce8b1efee41fee @tka tka committed Feb 18, 2012
Showing with 7 additions and 10 deletions.
  1. +2 −1 bin/startJar-linux.sh
  2. +5 −9 src/ui/tray.rb
View
@@ -3,6 +3,7 @@ if [ "$1" = "full" ]; then
rake rawr:clean
fi
rake rawr:jar
-java -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -Djruby.reify.classes=true \
+#java -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -Djruby.reify.classes=true -Djruby.compat.version="1.9" \
+java -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -Djruby.reify.classes=true \
-Xms512m -Xmn128m \
-client -Xverify:none -Xbootclasspath/a:lib/java/jruby-complete.jar -jar package/jar/compass-app.jar
View
@@ -321,18 +321,14 @@ def update_config(need_clean_attr, value)
File.open(file_name, 'w'){ |f| f.write(new_config) }
else
- config_dir = File.join(Compass.configuration.project_path, 'config')
+ config_filename = File.join(Compass.configuration.project_path, 'config.rb')
- if !File.directory?(config_dir)
- if File.exists?(config_dir) #file "config" exists!
- App.alert("can't create folder #{config_dir}")
- return
- end
-
- Dir.mkdir( File.join(Compass.configuration.project_path, 'config') )
+ if File.exists?(config_filename) #file "config.rb" exists!
+ App.alert("can't create #{config_filename}")
+ return
end
- File.open( File.join(Compass.configuration.project_path, 'config', 'compass.rb'), 'w'){ |f| f.write(new_config_str) }
+ File.open( config_filename, 'w'){ |f| f.write(new_config_str) }
end
end

0 comments on commit c6addf7

Please sign in to comment.