overspend1/Ultroid-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Ensure setup script reads from /dev/tty for input

Browse Source 
When stdin is not a terminal (e.g., in some script execution
contexts or if redirected), the `read` command may fail to capture
user input. This change modifies the input prompting functions
(`_prompt_user` and `_prompt_user_sensitive`) to explicitly
read from `/dev/tty` if stdin is not a terminal but `/dev/tty`
is available.

This should resolve issues where users are unable to type or paste
input during the setup process, particularly when selecting the
Docker approach and being prompted for API hash or other credentials.
This commit is contained in:
google-labs-jules[bot]
2025-06-20 09:25:30 +00:00
parent 10da311d83
commit 3d433ba1d7
1 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ultroid_setup.sh
View File

@@ -76,14 +76,36 @@ _check_python_version() {
_prompt_user() {
local prompt_message="$1"
local var_name="$2"
local default_value="${3:-}" # Use bash specific default value assignment
local current_value="${!var_name:-$default_value}" # Get current value of var_name or default
local default_value="${3:-}"
local current_value="${!var_name:-$default_value}" # Not used currently, but good for reference
local input
local read_target_set_internally=false
# Check if stdin (fd 0) is a terminal
if ! [ -t 0 ]; then
# If stdin is not a terminal, check if /dev/tty is available
if [ -c /dev/tty ]; then
read_target_set_internally=true
else
_print_msg error "Cannot read user input: No TTY available. stdin is not a terminal and /dev/tty is not accessible."
# Exiting because user input is critical for this script.
# Alternatively, could return an error code: return 1
exit 1
fi
fi
if [ -n "$default_value" ]; then
read -p "$(echo -e "${YELLOW}$prompt_message${NC} [Default: $default_value]: ")" input
if $read_target_set_internally; then
read -p "$(echo -e "${YELLOW}$prompt_message${NC} [Default: $default_value]: ")" input < /dev/tty
else
read -p "$(echo -e "${YELLOW}$prompt_message${NC} [Default: $default_value]: ")" input
fi
else
read -p "$(echo -e "${YELLOW}$prompt_message${NC}: ")" input
if $read_target_set_internally; then
read -p "$(echo -e "${YELLOW}$prompt_message${NC}: ")" input < /dev/tty
else
read -p "$(echo -e "${YELLOW}$prompt_message${NC}: ")" input
fi
fi
if [ -z "$input" ] && [ -n "$default_value" ]; then
@@ -98,7 +120,25 @@ _prompt_user_sensitive() {
local var_name="$2"
local input
read -sp "$(echo -e "${YELLOW}$prompt_message${NC}: ")" input
local read_target_set_internally=false
# Check if stdin (fd 0) is a terminal
if ! [ -t 0 ]; then
# If stdin is not a terminal, check if /dev/tty is available
if [ -c /dev/tty ]; then
read_target_set_internally=true
else
_print_msg error "Cannot read sensitive user input: No TTY available. stdin is not a terminal and /dev/tty is not accessible."
# Exiting because user input is critical for this script.
# Alternatively, could return an error code: return 1
exit 1
fi
fi
if $read_target_set_internally; then
read -sp "$(echo -e "${YELLOW}$prompt_message${NC}: ")" input < /dev/tty
else
read -sp "$(echo -e "${YELLOW}$prompt_message${NC}: ")" input
fi
echo # Newline after sensitive input
eval "$var_name=\"$input\""
}