lib/ember_cli/shell.rb in ember-cli-rails-0.8.7 vs lib/ember_cli/shell.rb in ember-cli-rails-0.9.0

@@ -39,16 +39,18 @@
 
       if invalid_ember_dependencies?
         clean_ember_dependencies!
       end
 
-      if paths.yarn
+      if paths.yarn.present? && Pathname.new(paths.yarn).executable?
         run! "#{paths.yarn} install"
       else
         run! "#{paths.npm} prune && #{paths.npm} install"
       end
 
-      run! "[ -f bower.json ] && #{paths.bower} prune && #{paths.bower} install"
+      if paths.bower_json.exist?
+        run! "#{paths.bower} prune && #{paths.bower} install"
+      end
     end
 
     def test
       run! ember.test
     end