blob: 723b2848a322c03c418ef4cea62da5c3735a8320 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
#!/bin/bash -eu
# autoupdate and restart a tmwa-map server
## config is now in tmwa-map-wrapper-config
## utilities
trap 'echo EXIT $? >&2' EXIT
# prevent interaction
export GIT_EDITOR=:
# force commits to have predictable hashes
export GIT_AUTHOR_DATE='1970-01-01 00:00 +0000'
export GIT_COMMITTER_DATE='1970-01-01 00:00 +0000'
reset=$'\e[m'
black_fg=$'\e[30m'
red_fg=$'\e[31m'
green_fg=$'\e[32m'
yellow_fg=$'\e[33m'
blue_fg=$'\e[34m'
magenta_fg=$'\e[35m'
cyan_fg=$'\e[36m'
gray_fg=$'\e[37m'
reset2='##0'
black_fg2='##0'
red_fg2='##1'
green_fg2='##2'
blue_fg2='##3'
orange_fg2='##4'
yellow_fg2='##5'
pink_fg2='##6'
purple_fg2='##7'
gray_fg2='##8'
brown_fg2='##9'
now()
{
date -u +'%F %T'
}
good()
{
echo "$(now)$green_fg" "$@" "$reset" >&2
}
info()
{
echo "$(now)$cyan_fg" "$@" "$reset" >&2
}
warning()
{
echo "$(now)$yellow_fg" "$@" "$reset" >&2
}
error()
{
echo "$(now)$red_fg" "$@" "$reset" >&2
}
good2()
{
echo "$green_fg2" "$@" "$reset2"
}
info2()
{
echo "$brown_fg2" "$@" "$reset2"
}
warning2()
{
echo "$yellow_fg2" "$@" "$reset2"
}
error2()
{
echo "$red_fg2" "$@" "$reset2"
}
run()
{
info '$' "$@"
"$@"
}
try_merge()
{
test -n "$1"
local branch=$1 commit
info 'commit=$(' git rev-parse --verify -q $branch ')'
if ! commit=$(git rev-parse --verify -q $branch)
then
error2 bogus $branch >> $motd
error bogus $branch
return
fi
info commit=$commit
if run bash -c 'set -o pipefail; git branch --contains '$commit' | grep -qw master'
then
warning2 already $branch $commit >> $motd
warning already $branch
return
fi
if run git merge --ff-only $branch $commit
then
good2 fast $branch $commit >> $motd
good fast $branch $commit
return
fi
if run git merge $branch $commit
then
good2 merge $branch $commit >> $motd
good merge $branch $commit
return
fi
git merge --abort
error2 abort $branch $commit >> $motd
error abort $branch $commit
return
}
## main script
trouble=false
while true
do
start_time=$(date +%s)
source tmwa-map-wrapper-config
run test -f $motd
run cd $tmw_tools
run git pull
run cd $server_data
run git fetch --all
run git reset --hard $server_main_branch
info 'commit=$(' git rev-parse --verify -q $server_main_branch ')'
commit=$(git rev-parse --verify -q $server_main_branch)
info2 server base $server_main_branch $commit > $motd
if $trouble
then
error "Not merging branches - we're in trouble."
else
for branch in ${server_extra_branches[@]}
do
try_merge $branch
done
fi
$tmw_tools/secrets-build < $magic_conf.template > $magic_conf
$tmw_tools/news.py $start_dir $start_dir/news.d/
chmod a+r $start_dir/news.txt $start_dir/news.html
run cd $client_data
# restore update state to old
run cp ~/www/updates/resources.xml{.master,}
run cp ~/www/updates/resources2.txt{.master,}
run git branch -f update-zips $client_main_branch
# force new master and back up for future restoration
run git fetch --all
run git reset --hard $client_main_branch
run $tmw_tools/client/make-updates
run cp ~/www/updates/resources.xml{,.master}
run cp ~/www/updates/resources2.txt{,.master}
info 'commit=$(' git rev-parse --verify -q $client_main_branch ')'
commit=$(git rev-parse --verify -q $client_main_branch)
info2 client base $client_main_branch $commit >> $motd
if $trouble
then
error "Not merging branches - we're in trouble."
else
for branch in ${client_extra_branches[@]}
do
try_merge $branch
done
fi
# generate the transient updates
run $tmw_tools/client/make-updates
run cd $start_dir
info '$' tmwa-map
tmwa-map || { error tmwa-map exited with status $?; }
end_time=$(date +%s)
if (( end_time < start_time + expected_life ))
then
trouble=true
error 'Something is wrong'
run sleep $trouble_sleep
else
trouble=false
warning 'Something is not wrong'
run sleep $normal_sleep
fi
done
|