mirror of
https://github.com/ConnectedHumber/Air-Quality-Web
synced 2024-11-25 06:53:00 +00:00
Redorder build script
This commit is contained in:
parent
c209bc662b
commit
023d9fd94a
1 changed files with 13 additions and 13 deletions
26
build
26
build
|
@ -21,7 +21,7 @@ build_output_folder="./dist";
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
# Check out the lantern git submodule if needed
|
# Check out the lantern git submodule if needed
|
||||||
if [ ! -d "${lantern_path}" ]; then git submodule update --init "${lantern_path}"; fi
|
if [ ! -f "${lantern_path}/lantern.sh" ]; then git submodule update --init "${lantern_path}"; fi
|
||||||
|
|
||||||
source "${lantern_path}/lantern.sh";
|
source "${lantern_path}/lantern.sh";
|
||||||
|
|
||||||
|
@ -73,17 +73,6 @@ function task_setup {
|
||||||
stage_end $?;
|
stage_end $?;
|
||||||
}
|
}
|
||||||
|
|
||||||
function task_database {
|
|
||||||
task_begin "Connecting to the database";
|
|
||||||
|
|
||||||
ssh -TN db.connectedhumber.org -L 3306:localhost:3306 &
|
|
||||||
ssh_pid=$!;
|
|
||||||
mysql --host localhost --port 3306 -u "${USER}" -p;
|
|
||||||
|
|
||||||
kill $!; wait; sleep 0.5;
|
|
||||||
task_end $?;
|
|
||||||
}
|
|
||||||
|
|
||||||
function task_setup-dev {
|
function task_setup-dev {
|
||||||
task_begin "Checking environment";
|
task_begin "Checking environment";
|
||||||
check_command mysql true optional;
|
check_command mysql true optional;
|
||||||
|
@ -94,7 +83,18 @@ function task_setup-dev {
|
||||||
task_end $?;
|
task_end $?;
|
||||||
|
|
||||||
task_begin "Installing server development dependencies";
|
task_begin "Installing server development dependencies";
|
||||||
composer install --dev;
|
composer install;
|
||||||
|
task_end $?;
|
||||||
|
}
|
||||||
|
|
||||||
|
function task_database {
|
||||||
|
task_begin "Connecting to the database";
|
||||||
|
|
||||||
|
ssh -TN db.connectedhumber.org -L 3306:localhost:3306 &
|
||||||
|
ssh_pid=$!;
|
||||||
|
mysql --host localhost --port 3306 -u "${USER}" -p;
|
||||||
|
|
||||||
|
kill $!; wait; sleep 0.5;
|
||||||
task_end $?;
|
task_end $?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue