From 8871dcef7d991cb93c4e4e817a8db5aefa81c216 Mon Sep 17 00:00:00 2001 From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com> Date: Sat, 8 Feb 2020 12:53:46 -0800 Subject: [PATCH 1/4] Add an option to initialize the database from install.sh --- install.sh | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 168a1f6b..b1db69a7 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,39 @@ -#!/bin/sh +#!/bin/bash set -e +# Set the database variable to the default first. +# Don't forget to change this string to your actual database parameters +# if you don't plan to initialize the database in this script. export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy + +# Set other environment variables export JWT_SECRET=changeme export HOSTNAME=rrr +# Optionally initialize the database +init_db_valid=0 +init_db_final=0 +while [ "$init_db_valid" == 0 ] +do + read -p "Initialize database (y/n)? " init_db + case "${init_db,,}" in + y|yes ) init_db_valid=1; init_db_final=1;; + n|no ) init_db_valid=1 init_db_final=0;; + * ) echo "Invalid input" 1>&2;; + esac +done +if [ "$init_db_final" = 1 ] +then + source ./server/db-init.sh + read -n 1 -s -r -p "Press ENTER to continue execution of this script, press CTRL+C to quit..." +fi + +# Build the web client cd ui yarn yarn build + +# Build and run the backend cd ../server cargo run From 186ad57858c7bfe1cab1578abaf8a2781e5524a1 Mon Sep 17 00:00:00 2001 From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com> Date: Sat, 8 Feb 2020 12:54:41 -0800 Subject: [PATCH 2/4] Fix a user prompt in install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index b1db69a7..60bf6734 100755 --- a/install.sh +++ b/install.sh @@ -25,7 +25,7 @@ done if [ "$init_db_final" = 1 ] then source ./server/db-init.sh - read -n 1 -s -r -p "Press ENTER to continue execution of this script, press CTRL+C to quit..." + read -n 1 -s -r -p "Press ANY KEY to continue execution of this script, press CTRL+C to quit..." fi # Build the web client From 15ef4a7122acf90d7af8c8c24eca4671c1f3302f Mon Sep 17 00:00:00 2001 From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com> Date: Sat, 8 Feb 2020 12:56:13 -0800 Subject: [PATCH 3/4] Add a semicolon. --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 60bf6734..9bed6e1d 100755 --- a/install.sh +++ b/install.sh @@ -18,7 +18,7 @@ do read -p "Initialize database (y/n)? " init_db case "${init_db,,}" in y|yes ) init_db_valid=1; init_db_final=1;; - n|no ) init_db_valid=1 init_db_final=0;; + n|no ) init_db_valid=1; init_db_final=0;; * ) echo "Invalid input" 1>&2;; esac done From a8126b33bbe3d7f10683f696dc82abff3a36665e Mon Sep 17 00:00:00 2001 From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com> Date: Sat, 8 Feb 2020 13:02:40 -0800 Subject: [PATCH 4/4] Add line breaks after user prompts in install.sh --- install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.sh b/install.sh index 9bed6e1d..b368891c 100755 --- a/install.sh +++ b/install.sh @@ -21,11 +21,13 @@ do n|no ) init_db_valid=1; init_db_final=0;; * ) echo "Invalid input" 1>&2;; esac + echo done if [ "$init_db_final" = 1 ] then source ./server/db-init.sh read -n 1 -s -r -p "Press ANY KEY to continue execution of this script, press CTRL+C to quit..." + echo fi # Build the web client