From 04e3aee65b3f2448a4fa7432108a3b4d59898571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Delattre?= Date: Fri, 20 Aug 2021 13:52:10 -1000 Subject: [PATCH] Fix indentation --- dev.sh | 106 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/dev.sh b/dev.sh index bb517a9..5be9cb9 100755 --- a/dev.sh +++ b/dev.sh @@ -18,35 +18,35 @@ MIGRATION_SCHEMA=./migrations DOCKER_COMPOSE_FILE=./docker/docker-compose.yml _usage() { - prog=$(basename "$0") + prog=$(basename "$0") echo "Usage:" - echo " $prog back" - echo " Apply the migrations, build and run the backend" - echo "" - echo " $prog front" - echo " Install the JS packages and run the frontend" - echo "" - echo " $prog migrate [args]" - echo " Runs the migrate command with the given parameters" - echo "" - echo " $prog db-shell" - echo " Get a psql shell on the database" - echo "" - echo " $prog db-init" - echo " Refresh the informations (imdb / movies / shows) needed" - echo " before the first run" - echo "" - echo " $prog docker-db [up|up -d|down|other docker-compose options...]" - echo " Setup the database in a docker" + echo " $prog back" + echo " Apply the migrations, build and run the backend" + echo "" + echo " $prog front" + echo " Install the JS packages and run the frontend" + echo "" + echo " $prog migrate [args]" + echo " Runs the migrate command with the given parameters" + echo "" + echo " $prog db-shell" + echo " Get a psql shell on the database" + echo "" + echo " $prog db-init" + echo " Refresh the informations (imdb / movies / shows) needed" + echo " before the first run" + echo "" + echo " $prog docker-db [up|up -d|down|other docker-compose options...]" + echo " Setup the database in a docker" exit 1 } _log_info() { - printf "$(tput setaf 5)-->$(tput setaf 2) %s$(tput sgr0)\n" "$@" + printf "$(tput setaf 5)-->$(tput setaf 2) %s$(tput sgr0)\n" "$@" } _log_error() { - printf "$(tput setaf 6)-->$(tput setaf 9) %s$(tput sgr0)\n" "$@" + printf "$(tput setaf 6)-->$(tput setaf 9) %s$(tput sgr0)\n" "$@" } _check_command() { @@ -86,37 +86,37 @@ _check_command fresh || { } canape_call() { - method=$1 - resource=$2 - _log_info "Calling: $method $resource ..." - response=$(curl --silent --show-error \ - -X "$method" \ - -H "Content-Type: application/json" \ - -H "Authorization: $TOKEN" \ - "http://localhost:3000/$resource") - [ -n "$response" ] && echo "$response" - _log_info "Done" + method=$1 + resource=$2 + _log_info "Calling: $method $resource ..." + response=$(curl --silent --show-error \ + -X "$method" \ + -H "Content-Type: application/json" \ + -H "Authorization: $TOKEN" \ + "http://localhost:3000/$resource") + [ -n "$response" ] && echo "$response" + _log_info "Done" } canape_login() { - # Skip if the user defined its own token - [ -n "$CANAPE_TOKEN" ] && return - _log_info "Logging in ..." - json_data=$(jq -n -c --arg username "$CANAPE_USERNAME" \ - --arg password "$CANAPE_PASS" \ - '{username: $username,password: $password}') - TOKEN=$(curl --silent --show-error -X POST \ - -d "$json_data" \ - http://localhost:3000/users/login | jq -r .data.token ) - _log_info "Logged in" + # Skip if the user defined its own token + [ -n "$CANAPE_TOKEN" ] && return + _log_info "Logging in ..." + json_data=$(jq -n -c --arg username "$CANAPE_USERNAME" \ + --arg password "$CANAPE_PASS" \ + '{username: $username,password: $password}') + TOKEN=$(curl --silent --show-error -X POST \ + -d "$json_data" \ + http://localhost:3000/users/login | jq -r .data.token ) + _log_info "Logged in" } canape_logout() { - # Skip if the user defined its own token - [ -n "$CANAPE_TOKEN" ] && return - _log_info "Disconnecting ..." - canape_call DELETE "users/tokens/$TOKEN" - _log_info "Disconnected" + # Skip if the user defined its own token + [ -n "$CANAPE_TOKEN" ] && return + _log_info "Disconnecting ..." + canape_call DELETE "users/tokens/$TOKEN" + _log_info "Disconnected" } case $1 in @@ -147,15 +147,15 @@ case $1 in (cd frontend && npm install && npm run-script start) ;; db-init) - _ensure_command jq - canape_login - canape_call POST ratings/refresh - canape_call POST movies/refresh - canape_call POST shows/refresh - canape_logout + _ensure_command jq + canape_login + canape_call POST ratings/refresh + canape_call POST movies/refresh + canape_call POST shows/refresh + canape_logout ;; *) - _log_error "Unknown command $1" + _log_error "Unknown command $1" _usage ;; esac