Improve show_pass function when sudo ask for a password (#19)

This commit is contained in:
Slava 2024-11-13 00:01:44 +02:00 committed by GitHub
parent bd59a7cd84
commit d4c534bb37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -51,7 +51,8 @@ show_progress() {
} }
show_pass() { show_pass() {
echo -e "\r\e[1A\e[0K ${PASS_MARK} ${1}" echo -e "\r\e[${TRIM:-1}A\e[0K ${PASS_MARK} ${1}"
unset TRIM
} }
show_fail() { show_fail() {
@ -188,6 +189,7 @@ for BINARY in "${BINARIES[@]}"; do
message="Installing ${FILE_NAME} to ${INSTALL_PATH}" message="Installing ${FILE_NAME} to ${INSTALL_PATH}"
show_progress "${message}" show_progress "${message}"
if ! (mkdir -p "${INSTALL_DIR}" && install -m 755 "${TEMP_DIR}/${FILE_NAME}" "${INSTALL_PATH}") 2> /dev/null; then if ! (mkdir -p "${INSTALL_DIR}" && install -m 755 "${TEMP_DIR}/${FILE_NAME}" "${INSTALL_PATH}") 2> /dev/null; then
$(sudo -n true 2>/dev/null) || TRIM=2
sudo mkdir -p "${INSTALL_DIR}" && sudo install -m 755 "${TEMP_DIR}/${FILE_NAME}" "${INSTALL_PATH}" sudo mkdir -p "${INSTALL_DIR}" && sudo install -m 755 "${TEMP_DIR}/${FILE_NAME}" "${INSTALL_PATH}"
[[ $? -ne 0 ]] && show_fail "${message}" [[ $? -ne 0 ]] && show_fail "${message}"
fi fi