Change to repository rather than username

Author: mheguy

git_update_scripts/generic-updater.sh

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
-#parameters: $1=folder $2=username $3=branch $4=map $5=debug
+#parameters: $1=folder $2=repository $3=branch $4=map $5=debug
 set -e
 repo_name="RedMew"
 
 folder=$1
-username=$2
+repository=$2
 branch=$3
 map=$4
 
 if [ -z "$folder" ]; then
     echo "Missing argument: folder."
     exit 1
 fi
-if [ -z "$username" ]; then
-    echo "Missing argument: github username."
+if [ -z "$repository" ]; then
+    echo "Missing argument: github repository."
     exit 1
 fi
 if [ -z "$branch" ]; then
@@ -33,7 +33,7 @@ fi
 
 echo "Updating folder: \"$folder\"..."
 
-url="https://github.com/$username/$repo_name.git"
+url="https://github.com/$repository/$repo_name.git"
 
 git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ fetch "$url" "$branch" > /dev/null
 git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ reset --hard "FETCH_HEAD" > /dev/null
@@ -62,4 +62,4 @@ fi
 
 touch /factorio/scenarios/"$folder"
 
-echo "$folder updated from $username $branch successfully with map: $map"
+echo "$folder updated from $repository $branch successfully with map: $map"

git_update_scripts/github-webhook.sh

@@ -5,7 +5,7 @@ if [ "$1" != "develop" ]; then
     exit 0
 fi
 
-#arguments to script: $1=folder $2=username $3=branch $4=map $5=debug
+#arguments to script: $1=folder $2=repository $3=branch $4=map $5=debug
 script_path='/home/factorio/backend_scripts/git_update_scripts/generic-updater.sh'
 log_path='/home/factorio/backend_scripts/logs/github_webhook_output.txt'
 

git_update_scripts/plaguesplayground.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
-#parameters: $1=folder $2=username $3=branch $4=map $5=debug
-##parameters: $1=username $2=branch $3=map $4=debug
+#parameters: $1=repository $2=branch $3=map $4=debug
 set -e #this forces an exit on any error
 
 if [ -z "$2" ]; then
@@ -10,17 +9,19 @@ else
     branch=$2
 fi
 
-# If branch is develop or a PR, force them to take the Refactorio username.
+# If branch is develop or a PR, force them to take the Refactorio repository.
 if [ "$branch" == "develop" ] || [[ $branch == pr/* ]]; then
-    echo "Develop or PR branch selected, changing username to Refactorio"
-    username="Refactorio"
+    echo "Develop or PR branch selected, changing repository to Refactorio"
+    repository="Refactorio"
+else
+    repository=$1
 fi
 
 if [ -z "$3" ]; then
     map="default"
     echo "No map provided, using 'default'."
 else
-    map=$2
+    map=$3
 fi
 
 if [ -z "$4" ]; then
@@ -30,11 +31,12 @@ else
     debug=$4
 fi
 
-# Custom section for discord names =/= github usernames
+# Custom section for discord names =/= github repository
 
-#arguments to script: folder=$1 username=$2 branch=$3 map=$4 debug=$5
+#arguments to script: folder=$1 repository=$2 branch=$3 map=$4 debug=$5
 script_path='/home/factorio/backend_scripts/git_update_scripts/generic-updater.sh'
 
 echo '------------------------------------------'
+echo $script_path RedMew $repository "$branch" "$map" "$debug"
 date
-$script_path RedMew $username "$branch" "$map" "$debug"
+$script_path RedMew $repository "$branch" "$map" "$debug"