From 218cbd50dfade7f023f38ec5b866919a7b12109e Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Fri, 11 Dec 2015 17:02:39 +1000 Subject: [PATCH 1/2] Add --verbose and --output=/path/to/file options --- netinstall.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/netinstall.sh b/netinstall.sh index ef3826c..e1e679a 100644 --- a/netinstall.sh +++ b/netinstall.sh @@ -9,6 +9,16 @@ channel=${2:-master} # if defined by 2nd argument install the defined version, o 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 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'`" @@ -36,7 +46,7 @@ sed -i "s|^arkstCommit='.*'$|arkstCommit='${COMMIT}'|" arkmanager version=`<../.version` sed -i "s|^arkstVersion=\".*\"|arkstVersion='${version}'|" arkmanager chmod +x install.sh -bash install.sh "$steamcmd_user" "$@" > /dev/null +bash install.sh "$steamcmd_user" "$@" >"$output" 2>&1 status=$? From 6f861ce4829759a6db3622552031548b55c7256d Mon Sep 17 00:00:00 2001 From: Fez Vrasta Date: Wed, 27 Jan 2016 23:38:58 +0100 Subject: [PATCH 2/2] fixes #323 --- tools/arkmanager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index ade4c8e..69109cc 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -63,7 +63,7 @@ doUninstallTools() { sudo= 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 [ -n "${install_datadir}" -a -x "${install_datadir}/arkmanager-uninstall.sh" ]; then