Overhaul git scripts

Author: mheguy

git_update_scripts/checkout-pr.sh

@@ -1,13 +1,19 @@
 #!/usr/bin/env bash
+#parameters: $1=folder $2=username $3=branch $4=map $5=debug
 set -e
 repo_name="RedMew"
 
+folder=$1
+username=$2
+branch=$3
+map=$4
+
 if [ -z "$folder" ]; then
     echo "Missing argument: folder."
     exit 1
 fi
-if [ -z "$repository" ]; then
-    echo "Missing argument: repository."
+if [ -z "$username" ]; then
+    echo "Missing argument: github username."
     exit 1
 fi
 if [ -z "$branch" ]; then
@@ -19,9 +25,17 @@ if [ -z "$map" ]; then
     exit 1
 fi
 
-repository="https://github.com/$repository/$repo_name.git"
+if [ "$5" == 'true' ]; then
+    debug=true
+else
+    debug=$5
+fi
+
+echo "Updating folder: \"$folder\"..."
+
+url="https://github.com/$username/$repo_name.git"
 
-git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ fetch "$repository" "$branch" > /dev/null
+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
 git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ rev-parse --short HEAD
 git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ log -1 --pretty=%B
@@ -31,7 +45,7 @@ rm /factorio/scenarios/"$folder"/redmew_git_banner.png -f
 
 file=/factorio/scenarios/"$folder"/map_gen/maps/"$map".lua
 
-if grep -q "data.presets" "$file"; then
+if ! grep -q "data.presets" "$file"; then
     echo "Deleting preset map data."
     rm /factorio/scenarios/"$folder"/map_gen/data/ -rf
 fi
@@ -47,3 +61,5 @@ else
 fi
 
 touch /factorio/scenarios/"$folder"
+
+echo "$folder updated from $username $branch successfully with map: $map"

git_update_scripts/generic-updater.sh

@@ -1,22 +1,23 @@
 #!/bin/bash
+#parameters: $1=branch
 set -e #this forces an exit on any error
 if [ "$1" != "develop" ]; then
     exit 0
 fi
 
-#arguments to script: folder=$1 repository=$2 branch=$3 map=$4 debug=$5
-script_path='/home/factorio/backend_scripts/git_update_scripts/update-from-args.sh'
+#arguments to script: $1=folder $2=username $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'
 
 {
     echo '------------------------------------------'
     date
     echo '-'
-    "$script_path" develop origin develop default false
+    "$script_path" develop Refactorio develop default false
     echo '-'
-    "$script_path" dev-debug origin develop default true
+    "$script_path" dev-debug Refactorio develop default true
     echo '-'
-    "$script_path" crashsite origin develop crash_site false
+    "$script_path" crashsite Refactorio develop crash_site false
     echo '-'
-    "$script_path" diggy origin develop diggy false
+    "$script_path" diggy Refactorio develop diggy false
 } >>"$log_path"

git_update_scripts/github-webhook.sh

@@ -1,14 +1,8 @@
 #!/bin/bash
+#parameters: $1=folder $2=username $3=branch $4=map $5=debug
+##parameters: $1=username $2=branch $3=map $4=debug
 set -e #this forces an exit on any error
 
-# arguments to script: repository=$1 branch=$2 map=$3 debug=$4
-
-if [ -z "$1" ]; then
-    echo "Missing argument: need to specify the repository."
-    exit 1
-fi
-repository=$1
-
 if [ -z "$2" ]; then
     branch="develop"
     echo "No branch provided, using 'develop'."
@@ -18,8 +12,8 @@ fi
 
 # If branch is develop or a PR, force them to take the Refactorio username.
 if [ "$branch" == "develop" ] || [[ $branch == pr/* ]]; then
-    echo "Develop or PR branch selected, changing repository to Refactorio"
-    repository="Refactorio"
+    echo "Develop or PR branch selected, changing username to Refactorio"
+    username="Refactorio"
 fi
 
 if [ -z "$3" ]; then
@@ -38,10 +32,9 @@ fi
 
 # Custom section for discord names =/= github usernames
 
-#arguments to script: folder=$1 repository=$2 branch=$3 map=$4 debug=$5
-script_path='/home/factorio/backend_scripts/git_update_scripts/update-from-args.sh'
-log_path='/home/factorio/backend_scripts/logs/plaguesplayground_output.txt'
+#arguments to script: folder=$1 username=$2 branch=$3 map=$4 debug=$5
+script_path='/home/factorio/backend_scripts/git_update_scripts/generic-updater.sh'
 
 echo '------------------------------------------'
 date
-"$script_path" RedMew $repository "$branch" "$map" "$debug"
+$script_path RedMew $username "$branch" "$map" "$debug"