File tree Expand file tree Collapse file tree 6 files changed +6
-18
lines changed Expand file tree Collapse file tree 6 files changed +6
-18
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,4 @@ debug=true
26
26
27
27
source /home/factorio/bin/generic-updater.sh
28
28
29
- echo " $folder updated successfully with map: $map "
30
-
31
- exit 0
29
+ echo " $folder updated successfully with PR:$1 and map: $map "
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ if [ -z "$map" ]; then
18
18
exit 1
19
19
fi
20
20
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
23
23
24
24
if [ " $cleanup " = true ]; then
25
25
echo " Deleting all map data."
43
43
fi
44
44
45
45
touch /factorio/scenarios/" $folder "
46
-
47
- exit 0
Original file line number Diff line number Diff line change @@ -8,8 +8,10 @@ log_path='/home/factorio/backend_scripts/logs/github_webhook_output.txt'
8
8
{
9
9
echo ' ------------------------------------------'
10
10
date
11
+ echo ' -'
11
12
" $script_path " develop origin develop default false false
13
+ echo ' -'
12
14
" $script_path " crashsite origin develop crash_site false false
15
+ echo ' -'
13
16
" $script_path " dev-debug origin develop default false true
14
- echo ' ------------------------------------------'
15
17
} >> " $log_path "
Original file line number Diff line number Diff line change @@ -28,8 +28,6 @@ if [ -z "$5" ]; then
28
28
exit 1
29
29
elif [ " $5 " == ' true' ]; then
30
30
cleanup=true
31
- elif [ " $5 " == ' false' ]; then
32
- cleanup=false
33
31
else
34
32
cleanup=$5
35
33
fi
@@ -38,8 +36,6 @@ if [ -z "$6" ]; then
38
36
exit 1
39
37
elif [ " $6 " == ' true' ]; then
40
38
debug=true
41
- elif [ " $6 " == ' false' ]; then
42
- debug=false
43
39
else
44
40
debug=$6
45
41
fi
54
50
source /home/factorio/bin/generic-updater.sh
55
51
56
52
echo " $folder updated from $repository /$branch successfully with map: $map "
57
-
58
- exit 0
Original file line number Diff line number Diff line change @@ -28,5 +28,3 @@ debug=true
28
28
source /home/factorio/bin/generic-updater.sh
29
29
30
30
echo " $folder updated successfully with map: $map "
31
-
32
- exit 0
Original file line number Diff line number Diff line change @@ -28,5 +28,3 @@ debug=true
28
28
source /home/factorio/bin/generic-updater.sh
29
29
30
30
echo " $folder updated successfully with map: $map "
31
-
32
- exit 0
You can’t perform that action at this time.
0 commit comments