elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-23 23:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #372 from FezVrasta/master

Browse Source 
Merge fixes from master into 1.5-dev
This commit is contained in:
Fez Vrasta 2016-01-29 14:23:22 +01:00
commit e560db7914
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netinstall.sh
View File

@ -9,6 +9,16 @@ channel=${2:-master} # if defined by 2nd argument install the defined version, o
shift shift
shift shift
output=/dev/null
if [ "$1" = "--verbose" ]; then
output=/dev/fd/1
shift
elif [[ "$1" =~ ^--output= ]]; then
output="${1#--output=}"
shift
fi
# Download and untar installation files # Download and untar installation files
cd /tmp cd /tmp
COMMIT="`curl -L -k -s https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/heads/${channel} | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`" COMMIT="`curl -L -k -s https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/heads/${channel} | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`"
@ -36,7 +46,7 @@ sed -i "s|^arkstCommit='.*'$|arkstCommit='${COMMIT}'|" arkmanager
version=`<../.version` version=`<../.version`
sed -i "s|^arkstVersion=\".*\"|arkstVersion='${version}'|" arkmanager sed -i "s|^arkstVersion=\".*\"|arkstVersion='${version}'|" arkmanager
chmod +x install.sh chmod +x install.sh
bash install.sh "$steamcmd_user" "$@" > /dev/null bash install.sh "$steamcmd_user" "$@" >"$output" 2>&1
status=$? status=$?

2
tools/arkmanager
View File

@ -63,7 +63,7 @@ doUninstallTools() {
sudo= sudo=
fi fi
read -p "Are you sure you want to uninstall the ARK Server Tools?" -n 1 -r read -p "Are you sure you want to uninstall the ARK Server Tools? [y/N]" -n 1 -r
if [[ "$REPLY" =~ ^[Yy]$ ]]; then if [[ "$REPLY" =~ ^[Yy]$ ]]; then
if [ -n "${install_datadir}" -a -x "${install_datadir}/arkmanager-uninstall.sh" ]; then if [ -n "${install_datadir}" -a -x "${install_datadir}/arkmanager-uninstall.sh" ]; then