A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(installer): say what the email prompt is for (#2784)
Hampus9bbf6c513bd5
diff --git a/fluxer_docs/src/installer/install.ps1 b/fluxer_docs/src/installer/install.ps1index e623e6e3d..3e3ecb969 100644--- a/fluxer_docs/src/installer/install.ps1+++ b/fluxer_docs/src/installer/install.ps1@@ -221,7 +221,7 @@ function Show-FluxerUsage {Write-FluxerLine ''Write-FluxerLine 'Options:'Write-FluxerLine ' -Domain <host> Hostname the instance answers on. Prompted when absent.'- Write-FluxerLine ' -Email <address> Address written as FLUXER_VAPID_EMAIL. Prompted when absent.'+ Write-FluxerLine ' -Email <address> Contact email for web push. Prompted when absent.'Write-FluxerLine ' -Engine <command> Container engine to drive. Default: docker, or podman when'Write-FluxerLine ' docker is absent.'Write-FluxerLine ' -Dir <path> Working directory. Default: the fluxer folder in the home'@@ -2001,7 +2001,7 @@ function Invoke-FluxerInstall {}$domainValue = Resolve-FluxerValue $Domain 'Hostname the instance answers on' '-Domain' $allowPrompt- $emailValue = Resolve-FluxerValue $Email 'Address to write as FLUXER_VAPID_EMAIL' '-Email' $allowPrompt+ $emailValue = Resolve-FluxerValue $Email 'Contact email for web push' '-Email' $allowPromptAssert-FluxerDomain $domainValueAssert-FluxerEmail $emailValuediff --git a/fluxer_docs/src/installer/install.sh b/fluxer_docs/src/installer/install.shindex b4b47b548..59b577070 100644--- a/fluxer_docs/src/installer/install.sh+++ b/fluxer_docs/src/installer/install.sh@@ -207,7 +207,7 @@ Usage: sh install.sh --domain <host> --email <address> [options]Options:--domain <host> Hostname the instance answers on. Prompted when absent.- --email <address> Address the operator reads. Prompted when absent.+ --email <address> Contact email for web push. Prompted when absent.--engine <command> Container engine to drive. Default docker, or podmanwhen docker is absent.--dir <path> Working directory. Default ~/fluxer, or the working@@ -650,7 +650,7 @@ fluxer_resolve_values() {if [ "$opt_non_interactive" -eq 1 ] || [ "$opt_dry_run" -eq 1 ] || [ ! -t 0 ]; thenfluxer_bad_usage '--email is required.'fi- fluxer_prompt 'Address you read' || fluxer_fail 1 'No address given.'+ fluxer_prompt 'Contact email for web push' || fluxer_fail 1 'No address given.'opt_email=$fluxer_prompt_valuefifluxer_valid_domain "$opt_domain" || fluxer_bad_usage "--domain $opt_domain is not a lowercase hostname. Give a bare hostname such as chat.example.com."