From dec6f7170a891a2a9b6e6ac084c4319ddeb4b969 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 19:16:58 +0000 Subject: [PATCH] GitHub bot: fix linting issues (nobuild) --- ente/rootfs/etc/cont-init.d/99-run.sh | 156 +++++++++++++------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/ente/rootfs/etc/cont-init.d/99-run.sh b/ente/rootfs/etc/cont-init.d/99-run.sh index cc1ae776e..32e7ff04b 100644 --- a/ente/rootfs/etc/cont-init.d/99-run.sh +++ b/ente/rootfs/etc/cont-init.d/99-run.sh @@ -16,7 +16,7 @@ mkdir -p /config/scripts/compose ############################################ USE_EXTERNAL_DB=false if bashio::config.true 'USE_EXTERNAL_DB'; then - USE_EXTERNAL_DB=true + USE_EXTERNAL_DB=true fi DB_NAME="$(bashio::config 'DB_DATABASE_NAME')" @@ -34,7 +34,7 @@ S3_BUCKET="$(bashio::config 'S3_BUCKET')" DISABLE_WEB_UI=false if bashio::config.true 'DISABLE_WEB_UI'; then - DISABLE_WEB_UI=true + DISABLE_WEB_UI=true fi ############################################ @@ -54,60 +54,60 @@ PGDATA="/config/postgres" ############################################ start_postgres() { - if $USE_EXTERNAL_DB; then - bashio::log.info "External DB enabled; skipping internal Postgres start." - return 0 - fi + if $USE_EXTERNAL_DB; then + bashio::log.info "External DB enabled; skipping internal Postgres start." + return 0 + fi - # runtime socket dir - mkdir -p /run/postgresql - chown postgres:postgres /run/postgresql - chmod 775 /run/postgresql + # runtime socket dir + mkdir -p /run/postgresql + chown postgres:postgres /run/postgresql + chmod 775 /run/postgresql - # data dir - mkdir -p "$PGDATA" - chown -R postgres:postgres "$PGDATA" - chmod 0700 "$PGDATA" + # data dir + mkdir -p "$PGDATA" + chown -R postgres:postgres "$PGDATA" + chmod 0700 "$PGDATA" - if [[ ! -s "$PGDATA/PG_VERSION" ]]; then - bashio::log.info "Initializing Postgres data directory..." - su - postgres -c "$INITDB -D $PGDATA" - fi + if [[ ! -s "$PGDATA/PG_VERSION" ]]; then + bashio::log.info "Initializing Postgres data directory..." + su - postgres -c "$INITDB -D $PGDATA" + fi - bashio::log.info "Starting Postgres (127.0.0.1:5432)..." - # background so startup can continue - su - postgres -c "$POSTGRES_BIN -D $PGDATA -c listen_addresses='127.0.0.1'" & - PG_PID=$! + bashio::log.info "Starting Postgres (127.0.0.1:5432)..." + # background so startup can continue + su - postgres -c "$POSTGRES_BIN -D $PGDATA -c listen_addresses='127.0.0.1'" & + PG_PID=$! } wait_postgres_ready() { - local host port user - if $USE_EXTERNAL_DB; then - host="$DB_HOST_EXT" - port="$DB_PORT_EXT" - user="$DB_USER" - bashio::log.info "Waiting for EXTERNAL Postgres at ${host}:${port}..." - else - host="$DB_HOST_INTERNAL" - port="$DB_PORT_INTERNAL" - # Use superuser 'postgres' for readiness check because DB_USER may not yet exist. - user="postgres" - bashio::log.info "Waiting for internal Postgres..." - fi - until pg_isready -q -h "$host" -p "$port" -U "$user"; do - sleep 1 - done - bashio::log.info "Postgres reachable." + local host port user + if $USE_EXTERNAL_DB; then + host="$DB_HOST_EXT" + port="$DB_PORT_EXT" + user="$DB_USER" + bashio::log.info "Waiting for EXTERNAL Postgres at ${host}:${port}..." + else + host="$DB_HOST_INTERNAL" + port="$DB_PORT_INTERNAL" + # Use superuser 'postgres' for readiness check because DB_USER may not yet exist. + user="postgres" + bashio::log.info "Waiting for internal Postgres..." + fi + until pg_isready -q -h "$host" -p "$port" -U "$user"; do + sleep 1 + done + bashio::log.info "Postgres reachable." } bootstrap_internal_db() { - if $USE_EXTERNAL_DB; then - return 0 - fi - bashio::log.info "Creating role/database if needed..." + if $USE_EXTERNAL_DB; then + return 0 + fi + bashio::log.info "Creating role/database if needed..." - # Use psql via local socket (faster, avoids password) - psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres </dev/null; do - sleep 1 - done - bashio::log.info "Ensuring bucket ${S3_BUCKET}..." - "$MC_BIN" mb -p "h0/${S3_BUCKET}" || true - bashio::log.info "MinIO bucket ready." + bashio::log.info "Waiting for MinIO API..." + until "$MC_BIN" alias set h0 http://127.0.0.1:3200 "$MINIO_USER" "$MINIO_PASS" 2>/dev/null; do + sleep 1 + done + bashio::log.info "Ensuring bucket ${S3_BUCKET}..." + "$MC_BIN" mb -p "h0/${S3_BUCKET}" || true + bashio::log.info "MinIO bucket ready." } start_web() { - if $DISABLE_WEB_UI; then - bashio::log.info "Web UI disabled." - return 0 - fi - bashio::log.info "Starting Ente web (:3000)..." - "$WEB_BIN" & - WEB_PID=$! + if $DISABLE_WEB_UI; then + bashio::log.info "Web UI disabled." + return 0 + fi + bashio::log.info "Starting Ente web (:3000)..." + "$WEB_BIN" & + WEB_PID=$! } start_museum_foreground() { - local cfg=/config/museum.yaml - if ! bashio::fs.file_exists "$cfg"; then - bashio::log.error "$cfg missing; cannot start museum." - return 1 - fi + local cfg=/config/museum.yaml + if ! bashio::fs.file_exists "$cfg"; then + bashio::log.error "$cfg missing; cannot start museum." + return 1 + fi - # For internal DB: wait one more time as DB_USER (ensures role exists) - if ! $USE_EXTERNAL_DB; then - bashio::log.info "Verifying internal DB user '${DB_USER}'..." - until pg_isready -q -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U "$DB_USER"; do - sleep 1 - done - fi + # For internal DB: wait one more time as DB_USER (ensures role exists) + if ! $USE_EXTERNAL_DB; then + bashio::log.info "Verifying internal DB user '${DB_USER}'..." + until pg_isready -q -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U "$DB_USER"; do + sleep 1 + done + fi - bashio::log.info "Starting museum (foreground)..." - exec "$MUSEUM_BIN" --config "$cfg" + bashio::log.info "Starting museum (foreground)..." + exec "$MUSEUM_BIN" --config "$cfg" } ############################################