From b7bb6e5b48737046c326a2de93ba4bbe0bb72141 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sun, 18 Sep 2016 01:20:47 +1000
Subject: [PATCH] Move repo name to top of files

---
 netinstall.sh    | 10 ++++++----
 tools/arkmanager | 13 +++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/netinstall.sh b/netinstall.sh
index 006b2bb..1ae38db 100644
--- a/netinstall.sh
+++ b/netinstall.sh
@@ -4,6 +4,8 @@
 # Net Installer, used with curl
 #
 
+arkstGithubRepo="FezVrasta/ark-server-tools"
+
 steamcmd_user="$1"
 channel=${2:-master} # if defined by 2nd argument install the defined version, otherwise install master
 shift
@@ -30,7 +32,7 @@ function doInstallFromCommit(){
   if [ -z "$tmpdir" ]; then echo "Unable to create temporary directory"; exit 1; fi
   cd "$tmpdir"
   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"
   if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi
   sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \
@@ -61,12 +63,12 @@ function doInstallFromRelease(){
       tag_name) tagname="${v}"; ;;
       body) desc="${v}"
     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
     echo "Latest release is ${tagname}"
     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"
   else
     echo "Unable to get latest release"
@@ -76,7 +78,7 @@ function doInstallFromRelease(){
 
 function doInstallFromBranch(){
   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 [ -n "$unstable" ]; then
diff --git a/tools/arkmanager b/tools/arkmanager
index dea38d6..18774ac 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -10,6 +10,7 @@
 arkstVersion='1.6-pre3'
 arkstTag=''
 arkstCommit=''
+arkstGithubRepo="FezVrasta/ark-server-tools"
 
 doUpgradeTools() {
   local sudo=sudo
@@ -43,7 +44,7 @@ doUpgradeToolsFromCommit(){
   if [ -z "$tmpdir" ]; then echo "Unable to create temporary directory"; exit 1; fi
   cd "$tmpdir"
   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"
   if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi
   sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \
@@ -65,14 +66,14 @@ doUpgradeToolsFromCommit(){
 }
 
 doUpgradeToolsFromBranch(){
-  arkstLatestVersion=`curl -s "https://raw.githubusercontent.com/FezVrasta/ark-server-tools/${arkstChannel}/.version"`
-  arkstLatestCommit=`curl -s "https://api.github.com/repos/FezVrasta/ark-server-tools/git/refs/heads/${arkstChannel}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`
+  arkstLatestVersion=`curl -s "https://raw.githubusercontent.com/${arkstGithubRepo}/${arkstChannel}/.version"`
+  arkstLatestCommit=`curl -s "https://api.github.com/repos/${arkstGithubRepo}/git/refs/heads/${arkstChannel}" | sed -n 's/^ *"sha": "\(.*\)",.*/\1/p'`
 
   if [ "$arkstLatestVersion" == "Not Found" ]; then
     echo "Channel ${arkstChannel} does not exist"
     echo
     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
     return
   fi
@@ -105,7 +106,7 @@ doUpgradeToolsFromRelease(){
       tag_name) tagname="${v}"; ;;
       body) desc="${v}"
     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 [ "$tagname" != "$arkstTag" ]; then
@@ -115,7 +116,7 @@ doUpgradeToolsFromRelease(){
       echo
       if [[ "$REPLY" =~ ^[Yy]$ ]]; then
         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"
       fi
     else