From d5458e0e18c170e16b0b5baf19a9275a548e8040 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 21:01:48 +0000 Subject: [PATCH] GitHub bot: fix linting issues (nobuild) --- ente/rootfs/etc/cont-init.d/99-run.sh | 208 +++++++++++++------------- 1 file changed, 105 insertions(+), 103 deletions(-) diff --git a/ente/rootfs/etc/cont-init.d/99-run.sh b/ente/rootfs/etc/cont-init.d/99-run.sh index 7198bfe78..fde3b51ff 100755 --- 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 ############################################ @@ -48,7 +48,7 @@ MC_BIN="/usr/local/bin/mc" MUSEUM_BIN="$(command -v museum || true)" [ -z "$MUSEUM_BIN" ] && [ -x /app/museum ] && MUSEUM_BIN=/app/museum [ -z "$MUSEUM_BIN" ] && [ -x /museum ] && MUSEUM_BIN=/museum -[ -z "$MUSEUM_BIN" ] && MUSEUM_BIN=museum # last resort: PATH +[ -z "$MUSEUM_BIN" ] && MUSEUM_BIN=museum # last resort: PATH WEB_BIN="$(command -v ente-web || true)" [ -z "$WEB_BIN" ] && [ -x /app/ente-web ] && WEB_BIN=/app/ente-web @@ -61,135 +61,137 @@ 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 - mkdir -p /run/postgresql - chown postgres:postgres /run/postgresql - chmod 775 /run/postgresql + mkdir -p /run/postgresql + chown postgres:postgres /run/postgresql + chmod 775 /run/postgresql - mkdir -p "$PGDATA" - chown -R postgres:postgres "$PGDATA" - chmod 0700 "$PGDATA" + 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)..." - 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)..." + su - postgres -c "$POSTGRES_BIN -D $PGDATA -c listen_addresses='127.0.0.1'" & + PG_PID=$! } wait_postgres_ready() { - local host port - if $USE_EXTERNAL_DB; then - host="$DB_HOST_EXT"; port="$DB_PORT_EXT" - bashio::log.info "Waiting for EXTERNAL Postgres at ${host}:${port}..." - else - host="$DB_HOST_INTERNAL"; port="$DB_PORT_INTERNAL" - bashio::log.info "Waiting for internal Postgres..." - fi - until pg_isready -q -h "$host" -p "$port"; do - sleep 1 - done - bashio::log.info "Postgres reachable." + local host port + if $USE_EXTERNAL_DB; then + host="$DB_HOST_EXT" + port="$DB_PORT_EXT" + bashio::log.info "Waiting for EXTERNAL Postgres at ${host}:${port}..." + else + host="$DB_HOST_INTERNAL" + port="$DB_PORT_INTERNAL" + bashio::log.info "Waiting for internal Postgres..." + fi + until pg_isready -q -h "$host" -p "$port"; do + sleep 1 + done + bashio::log.info "Postgres reachable." } bootstrap_internal_db() { - if $USE_EXTERNAL_DB; then - return 0 - fi + if $USE_EXTERNAL_DB; then + return 0 + fi - bashio::log.info "Creating role/database if needed..." + bashio::log.info "Creating role/database if needed..." - local esc_pass="${DB_PASS//\'/\'\'}" + local esc_pass="${DB_PASS//\'/\'\'}" - # role - if ! psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres -tAc \ - "SELECT 1 FROM pg_roles WHERE rolname = '${DB_USER}'" | grep -q 1; then - psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ - -c "CREATE ROLE \"${DB_USER}\" LOGIN PASSWORD '${esc_pass}';" - else - psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ - -c "ALTER ROLE \"${DB_USER}\" PASSWORD '${esc_pass}';" - fi + # role + if ! psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres -tAc \ + "SELECT 1 FROM pg_roles WHERE rolname = '${DB_USER}'" | grep -q 1; then + psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ + -c "CREATE ROLE \"${DB_USER}\" LOGIN PASSWORD '${esc_pass}';" + else + psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ + -c "ALTER ROLE \"${DB_USER}\" PASSWORD '${esc_pass}';" + fi - # db - if ! psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres -tAc \ - "SELECT 1 FROM pg_database WHERE datname = '${DB_NAME}'" | grep -q 1; then - psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ - -c "CREATE DATABASE \"${DB_NAME}\" OWNER \"${DB_USER}\";" - else - psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ - -c "ALTER DATABASE \"${DB_NAME}\" OWNER TO \"${DB_USER}\";" - fi + # db + if ! psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres -tAc \ + "SELECT 1 FROM pg_database WHERE datname = '${DB_NAME}'" | grep -q 1; then + psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ + -c "CREATE DATABASE \"${DB_NAME}\" OWNER \"${DB_USER}\";" + else + psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres \ + -c "ALTER DATABASE \"${DB_NAME}\" OWNER TO \"${DB_USER}\";" + fi - bashio::log.info "Internal Postgres ready." + bashio::log.info "Internal Postgres ready." } start_minio() { - bashio::log.info "Starting MinIO (:3200)..." - mkdir -p /config/minio-data - "$MINIO_BIN" server /config/minio-data --address ":3200" & - MINIO_PID=$! + bashio::log.info "Starting MinIO (:3200)..." + mkdir -p /config/minio-data + "$MINIO_BIN" server /config/minio-data --address ":3200" & + MINIO_PID=$! } wait_minio_ready_and_bucket() { - 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." + 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 - if [ -z "$WEB_BIN" ] || [ ! -x "$WEB_BIN" ]; then - bashio::log.warning "Web UI binary not found; skipping." - 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 + if [ -z "$WEB_BIN" ] || [ ! -x "$WEB_BIN" ]; then + bashio::log.warning "Web UI binary not found; skipping." + 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 - if [ ! -x "$MUSEUM_BIN" ] && ! command -v "$MUSEUM_BIN" >/dev/null 2>&1; then - bashio::log.error "Museum binary not found; cannot launch Ente API." - 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 + if [ ! -x "$MUSEUM_BIN" ] && ! command -v "$MUSEUM_BIN" >/dev/null 2>&1; then + bashio::log.error "Museum binary not found; cannot launch Ente API." + return 1 + fi - # Export ENTE_* overrides to guarantee correct credentials parsing. - # (Museum merges env vars over YAML.) - # Ref: environment override mechanism in museum docs. :contentReference[oaicite:2]{index=2} - if $USE_EXTERNAL_DB; then - export ENTE_DB_HOST="$DB_HOST_EXT" - export ENTE_DB_PORT="$DB_PORT_EXT" - else - export ENTE_DB_HOST="$DB_HOST_INTERNAL" - export ENTE_DB_PORT="$DB_PORT_INTERNAL" - fi - export ENTE_DB_USER="$DB_USER" - export ENTE_DB_PASSWORD="$DB_PASS" - export ENTE_DB_NAME="$DB_NAME" - export ENTE_DB_SSLMODE=disable + # Export ENTE_* overrides to guarantee correct credentials parsing. + # (Museum merges env vars over YAML.) + # Ref: environment override mechanism in museum docs. :contentReference[oaicite:2]{index=2} + if $USE_EXTERNAL_DB; then + export ENTE_DB_HOST="$DB_HOST_EXT" + export ENTE_DB_PORT="$DB_PORT_EXT" + else + export ENTE_DB_HOST="$DB_HOST_INTERNAL" + export ENTE_DB_PORT="$DB_PORT_INTERNAL" + fi + export ENTE_DB_USER="$DB_USER" + export ENTE_DB_PASSWORD="$DB_PASS" + export ENTE_DB_NAME="$DB_NAME" + export ENTE_DB_SSLMODE=disable - bashio::log.info "Starting museum (foreground)..." - exec "$MUSEUM_BIN" --config "$cfg" + bashio::log.info "Starting museum (foreground)..." + exec "$MUSEUM_BIN" --config "$cfg" } ############################################