From 08f2254a0e510981b98035fc6daedbe4a467bb1e Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Mon, 20 Mar 2023 12:40:45 +1100
Subject: [PATCH] Leverage bin/setup within script/setup

And remove duplicate output. `bin/setup` is the Rails default for
updating your environment after code updates and `script/setup` is our
convenience script for the initial setup and starting with sample data.
---
 script/setup | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/script/setup b/script/setup
index 64bec13d4f..d0c84566dc 100755
--- a/script/setup
+++ b/script/setup
@@ -30,14 +30,8 @@ fi
 # Install used Bundler version
 ./script/install-bundler
 
-# Install all dependencies
-bundle check || bundle install
-yarn install
-
-# Set up the database for both development and test
-# Confirming the default user and password
-printf '\n\n' | bundle exec rake db:setup db:test:prepare
-printf '\n'
+# Install dependencies, prepare database and tidy
+./bin/setup
 
 # Load some default data for your environment
 bundle exec rake ofn:sample_data