Compare commits

..
Author SHA1 Message Date
MickLesk 2556945964 PostgreSQL: keep installing when the Adminer prompt reads a closed console
The version prompts already end in || true; the two Adminer prompts did not, so a closed terminal killed the install right after PostgreSQL was set up.
2026-11-20 16:50:16 +01:00
3 changed files with 4 additions and 10 deletions

No files matched your search

+1 -4
View File
@@ -68,10 +68,7 @@ function update_script() {
msg_info "Patching nginx HTTP/2 (CVE-2026-123007, CVE-2026-123633)"
for commit in 61031503dc8087c2c17cd2142c9b4b19062f90c4 2df48a501d0fb8212b7d39dffeeff5876332ba59 e27f5fa84fe6e98505e70bc543b748747dad0a3b; do
curl_with_retry "https://api.github.com/repos/nginx/nginx/commits/${commit}" "/tmp/nginx-${commit}.patch" "-HAccept:application/vnd.github.patch" ||
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "/tmp/nginx-${commit}.patch"
patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s <"/tmp/nginx-${commit}.patch"
rm -f "/tmp/nginx-${commit}.patch"
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "-" | patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s
done
msg_ok "Patched nginx HTTP/2"
+1 -4
View File
@@ -42,10 +42,7 @@ fetch_and_deploy_from_url "https://openresty.org/download/openresty-${OPENRESTY_
msg_info "Patching nginx HTTP/2 (CVE-2026-123007, CVE-2026-123633)"
for commit in 61031503dc8087c2c17cd2142c9b4b19062f90c4 2df48a501d0fb8212b7d39dffeeff5876332ba59 e27f5fa84fe6e98505e70bc543b748747dad0a3b; do
curl_with_retry "https://api.github.com/repos/nginx/nginx/commits/${commit}" "/tmp/nginx-${commit}.patch" "-HAccept:application/vnd.github.patch" ||
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "/tmp/nginx-${commit}.patch"
patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s <"/tmp/nginx-${commit}.patch"
rm -f "/tmp/nginx-${commit}.patch"
curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "-" | patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s
done
msg_ok "Patched nginx HTTP/2"
+2 -2
View File
@@ -127,7 +127,7 @@ EOF
msg_ok "Installed PostgreSQL"
prompt="${var_postgresql_adminer:-}"
[[ -n "$prompt" ]] || read -r -p "${TAB3}Would you like to add Adminer? <y/N> " prompt
[[ -n "$prompt" ]] || read -r -p "${TAB3}Would you like to add Adminer? <y/N> " prompt || true
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
msg_info "Installing Adminer"
$STD apt install -y adminer
@@ -167,7 +167,7 @@ setup_alpine() {
msg_ok "Configured and Restarted PostgreSQL"
prompt="${var_postgresql_adminer:-}"
[[ -n "$prompt" ]] || read -r -p "${TAB3}Would you like to install Adminer with lighttpd? <y/N>: " prompt
[[ -n "$prompt" ]] || read -r -p "${TAB3}Would you like to install Adminer with lighttpd? <y/N>: " prompt || true
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
msg_info "Installing Adminer and dependencies"
$STD apk add --no-cache \