Merge branch 'master' into dev

This commit is contained in:
GenZmeY 2020-08-10 14:13:57 +03:00
commit cd48148a09
3 changed files with 10 additions and 4 deletions

View File

@ -253,8 +253,11 @@ function instance_list () # $*: [InstanceName[s]]
fi fi
for Instance in $InstanceList for Instance in $InstanceList
do do
(
instance_status "$Instance" instance_status "$Instance"
) &
done done
wait
} | sort -t : -k 4 } | sort -t : -k 4
} | column -t -s : } | column -t -s :
} }

View File

@ -59,6 +59,7 @@ function workshop_list ()
{ {
for WorkshopID in $(workshop_list_ids) for WorkshopID in $(workshop_list_ids)
do do
(
local Cache="$CacheDir/$WorkshopID" local Cache="$CacheDir/$WorkshopID"
local Downl="$DownloadDir/content/$AppClientNum/$WorkshopID" local Downl="$DownloadDir/content/$AppClientNum/$WorkshopID"
local Url="https://steamcommunity.com/sharedfiles/filedetails/?id=$WorkshopID" local Url="https://steamcommunity.com/sharedfiles/filedetails/?id=$WorkshopID"
@ -69,7 +70,9 @@ function workshop_list ()
local WsSize="-"; WsName="-" local WsSize="-"; WsName="-"
fi fi
echo "$WorkshopID $WsName $WsSize $Url" echo "$WorkshopID $WsName $WsSize $Url"
) &
done done
wait
} | sort -k 2 } | sort -k 2
} | column -t } | column -t
} }

View File

@ -1,7 +1,7 @@
%global steamuser steam %global steamuser steam
Name: kf2-srv Name: kf2-srv
Version: 0.14.0 Version: 0.14.1
Release: 1%{dist} Release: 1%{dist}
Summary: Killing Floor 2 server Summary: Killing Floor 2 server
Group: Amusements/Games Group: Amusements/Games
@ -12,9 +12,6 @@ Source0: %{name}-%{version}.tar.gz
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
#BuildRequires(check): xmllint
#BuildRequires(check): systemd >= 219
Requires: systemd >= 219 Requires: systemd >= 219
Requires: steamcmd >= 2018.01.05-5 Requires: steamcmd >= 2018.01.05-5
Requires: libxml2 Requires: libxml2
@ -99,6 +96,9 @@ if [[ $1 == 1 ]]; then # Install
fi fi
%changelog %changelog
* Sat Aug 8 2020 GenZmeY <genzmey@gmail.com> - 0.14.1-1
- parallel actions for instance list.
* Sat Aug 8 2020 GenZmeY <genzmey@gmail.com> - 0.14.0-1 * Sat Aug 8 2020 GenZmeY <genzmey@gmail.com> - 0.14.0-1
- new usage (groups/commands); - new usage (groups/commands);
- new code structure; - new code structure;