jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2024-12-29 13:52:03 +01:00
Code Issues Wiki Activity Actions

Validate Steam API key

Browse source
This commit is contained in:
aclist 2022-08-31 17:22:07 +09:00
parent 3787c7970d
commit 9e73ec8e60
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=2.6.0-rc.1 version=2.6.0-rc.2
aid=221100 aid=221100
game="dayz" game="dayz"
@ -152,7 +152,7 @@ branch="$branch"
seen_news="$seen_news" seen_news="$seen_news"
#Steam API key #Steam API key
steam_api="" steam_api="$steam_api"
END END
} }
write_desktop_file(){ write_desktop_file(){
@ -200,8 +200,9 @@ file_picker(){
guess_path(){ guess_path(){
echo "# Checking for default DayZ path" echo "# Checking for default DayZ path"
path=$(find $HOME -type d -regex ".*/steamapps/common/DayZ$" -print -quit) path=$(find $HOME -type d -regex ".*/steamapps/common/DayZ$" -print -quit)
if [[ -n $path ]]; then if [[ -n "$path" ]]; then
steam_path="$path" clean_path=$(echo -e "$path" | awk -F"/steamapps" '{print $1}')
steam_path="$clean_path"
else else
echo "# Searching for alternate DayZ path. This may take some time." echo "# Searching for alternate DayZ path. This may take some time."
path=$(find / -type d \( -path "/proc" -o -path "*/timeshift" -o -path "/tmp" -o -path "/usr" -o -path "/boot" -o -path "/proc" -o -path "/root" -o -path "/run" -o -path "/sys" -o -path "/etc" -o -path "/var" -o -path "/run" -o -path "/lost+found" \) -prune -o -regex ".*/steamapps/common/DayZ$" -print -quit 2>/dev/null) path=$(find / -type d \( -path "/proc" -o -path "*/timeshift" -o -path "/tmp" -o -path "/usr" -o -path "/boot" -o -path "/proc" -o -path "/root" -o -path "/run" -o -path "/sys" -o -path "/etc" -o -path "/var" -o -path "/run" -o -path "/lost+found" \) -prune -o -regex ".*/steamapps/common/DayZ$" -print -quit 2>/dev/null)
@ -254,7 +255,7 @@ err(){
varcheck(){ varcheck(){
[[ -z $api_key ]] && (err "Error in key: 'api_key'") [[ -z $api_key ]] && (err "Error in key: 'api_key'")
[[ -z $whitelist ]] && (err "Error in key: 'whitelist'") [[ -z $whitelist ]] && (err "Error in key: 'whitelist'")
[[ ! -d $game_dir ]] && (err "Malformed game path") [[ ! -d "$game_dir" ]] && (err "Malformed game path")
[[ $whitelist =~ [[:space:]] ]] && (err "Separate whitelist values with commas") [[ $whitelist =~ [[:space:]] ]] && (err "Separate whitelist values with commas")
} }
run_depcheck() { run_depcheck() {
@ -504,24 +505,27 @@ connect_by_ip(){
source $config_file source $config_file
if [[ -z $steam_api ]]; then if [[ -z $steam_api ]]; then
steam_api=$(zenity --entry --text="Key 'steam_api' not present in config file. Enter Steam API key:" --title="DZGUI" 2>/dev/null) steam_api=$(zenity --entry --text="Key 'steam_api' not present in config file. Enter Steam API key:" --title="DZGUI" 2>/dev/null)
if [[ -z $steam_api ]]; then if [[ $? -eq 1 ]] ; then
return
elif [[ $steam_api -lt 32 ]]; then
zenity --warning --title="DZGUI" --text="Check API key and try again."
return return
else else
add_steam_api add_steam_api
fi fi
fi fi
while true; do while true; do
if [[ $return_from_table -eq 1 ]]; then if [[ $return_from_table -eq 1 ]]; then
return_from_table=0 return_from_table=0
return return
fi fi
ip=$(zenity --entry --text="Enter server IP" --title="DZGUI" 2>/dev/null) ip=$(zenity --entry --text="Enter server IP" --title="DZGUI" 2>/dev/null)
[[ $? -eq 1 ]] && return [[ $? -eq 1 ]] && return
if validate_ip "$ip"; then if validate_ip "$ip"; then
fetch_ip_metadata fetch_ip_metadata
else else
continue continue
fi fi
done done
} }
fetch_mods(){ fetch_mods(){