Compare commits

..
Author SHA1 Message Date
MickLesk 0825f81bef postgresql: default the version prompt and match Alpine's packages
An empty answer, or no TTY, ended the install with 64. The prompt now
defaults to 17 and takes var_postgresql_version; the Alpine list is
16/17/18, which is what 3.24 ships.
2026-10-23 11:39:02 +02:00
3 changed files with 25 additions and 13 deletions

No files matched your search

+6 -4
View File
@@ -65,10 +65,12 @@ EOF
msg_ok "Installed/upgraded Testing repo packages" msg_ok "Installed/upgraded Testing repo packages"
fi fi
if ! command -v mise >/dev/null 2>&1; then if [[ ! -f /etc/apt/sources.list.d/mise.list ]]; then
MISE_ARCH="x64" msg_info "Installing Mise"
[[ "$(arch_resolve)" == "arm64" ]] && MISE_ARCH="arm64" curl -fSs https://mise.jdx.dev/gpg-key.pub | tee /etc/apt/keyrings/mise-archive-keyring.pub 1>/dev/null
fetch_and_deploy_gh_release "mise" "jdx/mise" "singlefile" "latest" "/usr/local/bin" "mise-v*-linux-${MISE_ARCH}" echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.pub arch=$(arch_resolve)] https://mise.jdx.dev/deb stable main" >/etc/apt/sources.list.d/mise.list
ensure_dependencies mise
msg_ok "Installed Mise"
fi fi
STAGING_DIR=/opt/staging STAGING_DIR=/opt/staging
+8 -5
View File
@@ -25,7 +25,7 @@ if lscpu | grep -q 'GenuineIntel'; then
echo " 2) **NEW** Intel OpenVINO CPU or iGPU" echo " 2) **NEW** Intel OpenVINO CPU or iGPU"
echo "" echo ""
read -r -p "${TAB3}Select machine-learning type [1]: " ML_TYPE || true read -r -p "${TAB3}Select machine-learning type [1]: " ML_TYPE
ML_TYPE="${ML_TYPE:-1}" ML_TYPE="${ML_TYPE:-1}"
if [[ "$ML_TYPE" == "2" ]]; then if [[ "$ML_TYPE" == "2" ]]; then
touch ~/.openvino touch ~/.openvino
@@ -110,7 +110,7 @@ setup_deb822_repo \
"https://repo.jellyfin.org/jellyfin_team.gpg.key" \ "https://repo.jellyfin.org/jellyfin_team.gpg.key" \
"https://repo.jellyfin.org/debian" \ "https://repo.jellyfin.org/debian" \
"$(get_os_info codename)" "$(get_os_info codename)"
install_packages_with_retry jellyfin-ffmpeg7 $STD apt install -y jellyfin-ffmpeg7
ln -sf /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg ln -sf /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg
ln -sf /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe ln -sf /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe
@@ -124,9 +124,12 @@ if [[ "$CTTYPE" == "0" && -d /dev/dri ]]; then
fi fi
msg_ok "Dependencies Installed" msg_ok "Dependencies Installed"
MISE_ARCH="x64" msg_info "Installing Mise"
[[ "$(arch_resolve)" == "arm64" ]] && MISE_ARCH="arm64" curl -fSs https://mise.jdx.dev/gpg-key.pub | tee /etc/apt/keyrings/mise-archive-keyring.pub 1>/dev/null
fetch_and_deploy_gh_release "mise" "jdx/mise" "singlefile" "latest" "/usr/local/bin" "mise-v*-linux-${MISE_ARCH}" echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.pub arch=$(arch_resolve)] https://mise.jdx.dev/deb stable main" >/etc/apt/sources.list.d/mise.list
apt_update_safe
$STD apt install -y mise
msg_ok "Installed Mise"
msg_info "Configuring Debian Testing Repo" msg_info "Configuring Debian Testing Repo"
if [[ -f /etc/apt/sources.list.d/debian.sources ]]; then if [[ -f /etc/apt/sources.list.d/debian.sources ]]; then
+11 -4
View File
@@ -14,9 +14,11 @@ network_check
update_os update_os
setup_deb_based() { setup_deb_based() {
read -r -p "${TAB3}Enter PostgreSQL version (15/16/17/18): " ver ver="${var_postgresql_version:-}"
[[ -n "$ver" ]] || read -r -p "${TAB3}Enter PostgreSQL version (15/16/17/18) [17]: " ver || true
ver="${ver:-17}"
[[ $ver =~ ^(15|16|17|18)$ ]] || { [[ $ver =~ ^(15|16|17|18)$ ]] || {
echo "Invalid version" msg_error "Invalid PostgreSQL version: ${ver} (expected 15, 16, 17 or 18)"
exit 64 exit 64
} }
PG_VERSION=$ver setup_postgresql PG_VERSION=$ver setup_postgresql
@@ -136,8 +138,13 @@ EOF
} }
setup_alpine() { setup_alpine() {
read -r -p "${TAB3}Enter PostgreSQL version (15/16/17): " ver ver="${var_postgresql_version:-}"
[[ $ver =~ ^(15|16|17)$ ]] || { echo "Invalid version"; exit 64; } [[ -n "$ver" ]] || read -r -p "${TAB3}Enter PostgreSQL version (16/17/18) [17]: " ver || true
ver="${ver:-17}"
[[ $ver =~ ^(16|17|18)$ ]] || {
msg_error "Invalid PostgreSQL version: ${ver} (expected 16, 17 or 18)"
exit 64
}
msg_info "Installing PostgreSQL ${ver}" msg_info "Installing PostgreSQL ${ver}"
$STD apk add --no-cache postgresql${ver} postgresql${ver}-contrib postgresql${ver}-openrc sudo $STD apk add --no-cache postgresql${ver} postgresql${ver}-contrib postgresql${ver}-openrc sudo