From 2fbdcaf58419842e96d0b3226e15f4b1623de075 Mon Sep 17 00:00:00 2001
From: Marek L <nospam.keram@gmail.com>
Date: Tue, 22 Mar 2016 20:11:52 +0000
Subject: Use || instead of `or` as preferred in rails code convention
---
railties/lib/rails/generators/rails/app/templates/bin/setup | 2 +-
railties/lib/rails/generators/rails/app/templates/bin/update | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'railties/lib/rails')
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup b/railties/lib/rails/generators/rails/app/templates/bin/setup
index df88bfd3bc..acae810c1a 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/setup
+++ b/railties/lib/rails/generators/rails/app/templates/bin/setup
@@ -15,7 +15,7 @@ chdir APP_ROOT do
puts '== Installing dependencies =='
system! 'gem install bundler --conservative'
- system('bundle check') or system!('bundle install')
+ system('bundle check') || system!('bundle install')
# puts "\n== Copying sample files =="
# unless File.exist?('config/database.yml')
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update b/railties/lib/rails/generators/rails/app/templates/bin/update
index c6ed3ae64b..770a605fed 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/update
+++ b/railties/lib/rails/generators/rails/app/templates/bin/update
@@ -15,7 +15,7 @@ chdir APP_ROOT do
puts '== Installing dependencies =='
system! 'gem install bundler --conservative'
- system 'bundle check' or system! 'bundle install'
+ system('bundle check') || system!('bundle install')
puts "\n== Updating database =="
system! 'bin/rails db:migrate'
--
cgit v1.2.3