Skip to content

Commit 328ab8b

Browse files
committed
Improve log output further and remove exits
1 parent 6050faa commit 328ab8b

File tree

6 files changed

+6
-18
lines changed

6 files changed

+6
-18
lines changed

git_update_scripts/checkout-pr.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,4 @@ debug=true
2626

2727
source /home/factorio/bin/generic-updater.sh
2828

29-
echo "$folder updated successfully with map: $map"
30-
31-
exit 0
29+
echo "$folder updated successfully with PR:$1 and map: $map"

git_update_scripts/generic-updater.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ if [ -z "$map" ]; then
1818
exit 1
1919
fi
2020

21-
git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ fetch "$repository"
22-
git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ reset --hard "$repository/$branch"
21+
git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ fetch "$repository" >/dev/null
22+
git --git-dir=/factorio/scenarios/"$folder"/.git/ --work-tree=/factorio/scenarios/"$folder"/ reset --hard "$repository/$branch" >/dev/null
2323

2424
if [ "$cleanup" = true ]; then
2525
echo "Deleting all map data."
@@ -43,5 +43,3 @@ else
4343
fi
4444

4545
touch /factorio/scenarios/"$folder"
46-
47-
exit 0

git_update_scripts/github-webhook.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ log_path='/home/factorio/backend_scripts/logs/github_webhook_output.txt'
88
{
99
echo '------------------------------------------'
1010
date
11+
echo '-'
1112
"$script_path" develop origin develop default false false
13+
echo '-'
1214
"$script_path" crashsite origin develop crash_site false false
15+
echo '-'
1316
"$script_path" dev-debug origin develop default false true
14-
echo '------------------------------------------'
1517
} >>"$log_path"

git_update_scripts/update-from-args.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ if [ -z "$5" ]; then
2828
exit 1
2929
elif [ "$5" == 'true' ]; then
3030
cleanup=true
31-
elif [ "$5" == 'false' ]; then
32-
cleanup=false
3331
else
3432
cleanup=$5
3533
fi
@@ -38,8 +36,6 @@ if [ -z "$6" ]; then
3836
exit 1
3937
elif [ "$6" == 'true' ]; then
4038
debug=true
41-
elif [ "$6" == 'false' ]; then
42-
debug=false
4339
else
4440
debug=$6
4541
fi
@@ -54,5 +50,3 @@ map=$4
5450
source /home/factorio/bin/generic-updater.sh
5551

5652
echo "$folder updated from $repository/$branch successfully with map: $map"
57-
58-
exit 0

git_update_scripts/update-grilled.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,3 @@ debug=true
2828
source /home/factorio/bin/generic-updater.sh
2929

3030
echo "$folder updated successfully with map: $map"
31-
32-
exit 0

git_update_scripts/update-plague.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,3 @@ debug=true
2828
source /home/factorio/bin/generic-updater.sh
2929

3030
echo "$folder updated successfully with map: $map"
31-
32-
exit 0

0 commit comments

Comments
 (0)