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

Move repo name to top of files

Browse Source
This commit is contained in:
Ben Peddell 2016-09-18 01:20:47 +10:00
parent 02173e86df
commit b7bb6e5b48
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netinstall.sh
View File

@ -4,6 +4,8 @@
# Net Installer, used with curl # Net Installer, used with curl
# #
arkstGithubRepo="FezVrasta/ark-server-tools"
steamcmd_user="$1" steamcmd_user="$1"
channel=${2:-master} # if defined by 2nd argument install the defined version, otherwise install master channel=${2:-master} # if defined by 2nd argument install the defined version, otherwise install master
shift shift
@ -30,7 +32,7 @@ function doInstallFromCommit(){
if [ -z "$tmpdir" ]; then echo "Unable to create temporary directory"; exit 1; fi if [ -z "$tmpdir" ]; then echo "Unable to create temporary directory"; exit 1; fi
cd "$tmpdir" cd "$tmpdir"
echo "Downloading installer" echo "Downloading installer"
curl -L "https://github.com/FezVrasta/ark-server-tools/archive/${commit}.tar.gz" | tar -xz curl -L "https://github.com/${arkstGithubRepo}/archive/${commit}.tar.gz" | tar -xz
cd "ark-server-tools-${commit}/tools" cd "ark-server-tools-${commit}/tools"
if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi
sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \ sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \
@ -61,12 +63,12 @@ function doInstallFromRelease(){
tag_name) tagname="${v}"; ;; tag_name) tagname="${v}"; ;;
body) desc="${v}" body) desc="${v}"
esac esac
done < <(curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/releases/latest" | sed -n 's/^ "\([^"]*\)": "*\([^"]*\)"*,*/\1\t\2/p') done < <(curl -s "https://api.github.com/repos/${arkstGithubRepo}/releases/latest" | sed -n 's/^ "\([^"]*\)": "*\([^"]*\)"*,*/\1\t\2/p')
if [ -n "$tagname" ]; then if [ -n "$tagname" ]; then
echo "Latest release is ${tagname}" echo "Latest release is ${tagname}"
echo "Getting commit for latest release..." echo "Getting commit for latest release..."
local commit="$(curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/tags/${tagname}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p')" local commit="$(curl -s "https://api.github.com/repos/${arkstGithubRepo}/git/refs/tags/${tagname}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p')"
doUpgradeToolsFromCommit "$commit" doUpgradeToolsFromCommit "$commit"
else else
echo "Unable to get latest release" echo "Unable to get latest release"
@ -76,7 +78,7 @@ function doInstallFromRelease(){
function doInstallFromBranch(){ function doInstallFromBranch(){
channel="$1" channel="$1"
commit="`curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/heads/${channel}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`" commit="`curl -s "https://api.github.com/repos/${arkstGithubRepo}/git/refs/heads/${channel}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`"
if [ -z "$commit" ]; then if [ -z "$commit" ]; then
if [ -n "$unstable" ]; then if [ -n "$unstable" ]; then

13
tools/arkmanager
View File

@ -10,6 +10,7 @@
arkstVersion='1.6-pre3' arkstVersion='1.6-pre3'
arkstTag='' arkstTag=''
arkstCommit='' arkstCommit=''
arkstGithubRepo="FezVrasta/ark-server-tools"
doUpgradeTools() { doUpgradeTools() {
local sudo=sudo local sudo=sudo
@ -43,7 +44,7 @@ doUpgradeToolsFromCommit(){
if [ -z "$tmpdir" ]; then echo "Unable to create temporary directory"; exit 1; fi if [ -z "$tmpdir" ]; then echo "Unable to create temporary directory"; exit 1; fi
cd "$tmpdir" cd "$tmpdir"
echo "Downloading installer" echo "Downloading installer"
curl -L "https://github.com/FezVrasta/ark-server-tools/archive/${commit}.tar.gz" | tar -xz curl -L "https://github.com/${arkstGithubRepo}/archive/${commit}.tar.gz" | tar -xz
cd "ark-server-tools-${commit}/tools" cd "ark-server-tools-${commit}/tools"
if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi
sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \ sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \
@ -65,14 +66,14 @@ doUpgradeToolsFromCommit(){
} }
doUpgradeToolsFromBranch(){ doUpgradeToolsFromBranch(){
arkstLatestVersion=`curl -s "https://raw.githubusercontent.com/FezVrasta/ark-server-tools/${arkstChannel}/.version"` arkstLatestVersion=`curl -s "https://raw.githubusercontent.com/${arkstGithubRepo}/${arkstChannel}/.version"`
arkstLatestCommit=`curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/heads/${arkstChannel}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'` arkstLatestCommit=`curl -s "https://api.github.com/repos/${arkstGithubRepo}/git/refs/heads/${arkstChannel}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`
if [ "$arkstLatestVersion" == "Not Found" ]; then if [ "$arkstLatestVersion" == "Not Found" ]; then
echo "Channel ${arkstChannel} does not exist" echo "Channel ${arkstChannel} does not exist"
echo echo
echo "Available channels:" echo "Available channels:"
curl -s https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/heads | sed -n 's|^ *"ref": "refs/heads/\(.*\)",|\1|p' curl -s "https://api.github.com/repos/${arkstGithubRepo}/git/refs/heads" | sed -n 's|^ *"ref": "refs/heads/\(.*\)",|\1|p'
echo echo
return return
fi fi
@ -105,7 +106,7 @@ doUpgradeToolsFromRelease(){
tag_name) tagname="${v}"; ;; tag_name) tagname="${v}"; ;;
body) desc="${v}" body) desc="${v}"
esac esac
done < <(curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/releases/latest" | sed -n 's/^ "\([^"]*\)": "*\([^"]*\)"*,*/\1\t\2/p') done < <(curl -s "https://api.github.com/repos/${arkstGithubRepo}/releases/latest" | sed -n 's/^ "\([^"]*\)": "*\([^"]*\)"*,*/\1\t\2/p')
if [ -n "$tagname" ]; then if [ -n "$tagname" ]; then
if [ "$tagname" != "$arkstTag" ]; then if [ "$tagname" != "$arkstTag" ]; then
@ -115,7 +116,7 @@ doUpgradeToolsFromRelease(){
echo echo
if [[ "$REPLY" =~ ^[Yy]$ ]]; then if [[ "$REPLY" =~ ^[Yy]$ ]]; then
echo "Getting commit for latest release..." echo "Getting commit for latest release..."
local commit="$(curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/tags/${tagname}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p')" local commit="$(curl -s "https://api.github.com/repos/${arkstGithubRepo}/git/refs/tags/${tagname}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p')"
doUpgradeToolsFromCommit "$commit" doUpgradeToolsFromCommit "$commit"
fi fi
else else