sporada/lug-helper
1
0
Fork 0
mirror of https://github.com/the-sane/lug-helper.git synced 2024-09-21 14:22:53 +00:00
Code Issues Projects Releases Wiki Activity

Move file download code into function

Browse Source
This commit is contained in:
the-sane 2024-09-02 01:08:16 -04:00
parent 84fde4af35
commit 519c5ac3f9
1 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lug-helper.sh
View File

@ -1094,6 +1094,47 @@ preflight_check() {
######## begin download functions ########################################## ######## begin download functions ##########################################
############################################################################ ############################################################################
# Download a file to the tmp directory
# Expects two arguments, the download URL and the file name
download_file() {
# This function expects two string arguments
if [ "$#" -lt 2 ]; then
printf "\nScript error: The download_file function expects two arguments. Aborting.\n"
read -n 1 -s -p "Press any key..."
exit 0
fi
# Capture the arguments
download_url="$1"
download_filename="$2"
# Download the item to the tmp directory
debug_print continue "Downloading $download_url into $tmp_dir/$download_filename..."
if [ "$use_zenity" -eq 1 ]; then
# Format the curl progress bar for zenity
mkfifo "$tmp_dir/lugpipe"
cd "$tmp_dir" && curl -#LO "$download_url" > "$tmp_dir/lugpipe" 2>&1 & curlpid="$!"
stdbuf -oL tr '\r' '\n' < "$tmp_dir/lugpipe" | \
grep --line-buffered -ve "100" | grep --line-buffered -o "[0-9]*\.[0-9]" | \
(
trap 'kill "$curlpid"' ERR
zenity --progress --auto-close --title="Star Citizen LUG Helper" --text="Downloading ${download_type}. This might take a moment.\n" 2>/dev/null
)
if [ "$?" -eq 1 ]; then
# User clicked cancel
debug_print continue "Download aborted. Removing $tmp_dir/$download_filename..."
rm --interactive=never "${tmp_dir:?}/$download_filename"
rm --interactive=never "${tmp_dir:?}/lugpipe"
return 1
fi
rm --interactive=never "${tmp_dir:?}/lugpipe"
else
# Standard curl progress bar
(cd "$tmp_dir" && curl -LO "$download_url")
fi
}
# Detect which version of Lutris is running and restart it # Detect which version of Lutris is running and restart it
lutris_restart() { lutris_restart() {
# Detect the installed versions of Lutris # Detect the installed versions of Lutris
@ -1439,30 +1480,7 @@ download_install() {
fi fi
# Download the item to the tmp directory # Download the item to the tmp directory
debug_print continue "Downloading $download_url into $tmp_dir/$download_filename..." download_file "$download_url" "$download_filename"
if [ "$use_zenity" -eq 1 ]; then
# Format the curl progress bar for zenity
mkfifo "$tmp_dir/lugpipe"
cd "$tmp_dir" && curl -#LO "$download_url" > "$tmp_dir/lugpipe" 2>&1 & curlpid="$!"
stdbuf -oL tr '\r' '\n' < "$tmp_dir/lugpipe" | \
grep --line-buffered -ve "100" | grep --line-buffered -o "[0-9]*\.[0-9]" | \
(
trap 'kill "$curlpid"' ERR
zenity --progress --auto-close --title="Star Citizen LUG Helper" --text="Downloading ${download_type}. This might take a moment.\n" 2>/dev/null
)
if [ "$?" -eq 1 ]; then
# User clicked cancel
debug_print continue "Download aborted. Removing $tmp_dir/$download_filename..."
rm --interactive=never "${tmp_dir:?}/$download_filename"
rm --interactive=never "${tmp_dir:?}/lugpipe"
return 1
fi
rm --interactive=never "${tmp_dir:?}/lugpipe"
else
# Standard curl progress bar
(cd "$tmp_dir" && curl -LO "$download_url")
fi
# Sanity check # Sanity check
if [ ! -f "$tmp_dir/$download_filename" ]; then if [ ! -f "$tmp_dir/$download_filename" ]; then