diff options
| author | Bruno Cesar Ribas <brunoribas@gmail.com> | 2018-10-23 11:58:14 +0000 |
|---|---|---|
| committer | Bruno Cesar Ribas <brunoribas@gmail.com> | 2018-10-23 11:58:14 +0000 |
| commit | ee2f72f16c37f96e99bb6b51c01fc88122533b86 (patch) | |
| tree | 2ebe6a70b99277638962d32e8caa81876574e6d1 /tools | |
| parent | 8fa580d8a0ef5a9e2455c477a296cb0a537e0ba3 (diff) | |
| parent | b22599392fed08b5e86af140a4508a8892058088 (diff) | |
| download | boca-ee2f72f16c37f96e99bb6b51c01fc88122533b86.tar.gz boca-ee2f72f16c37f96e99bb6b51c01fc88122533b86.zip | |
Merge remote-tracking branch 'origin/develc' into devel
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/boca-auth-runs | 13 | ||||
| -rw-r--r-- | tools/boca-fixes | 2 | ||||
| -rw-r--r-- | tools/boca-submit-log | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/tools/boca-auth-runs b/tools/boca-auth-runs index 488e65b..6b53d9f 100755 --- a/tools/boca-auth-runs +++ b/tools/boca-auth-runs @@ -59,8 +59,8 @@ if [ "$?" == "0" ]; then if [ $? == 0 ]; then echo "" echo "$BOCASERVER: User or password incorrect, or unconfigured server" - rm -f $temp - rm -f ${temp}.cookie.txt + rm -f "$temp" + rm -f "${temp}.cookie.txt" exit 3 else a="" @@ -77,6 +77,13 @@ if [ "$?" == "0" ]; then grep -q "$iv" "${temp}.1" if [ "$?" == "0" ]; then /bin/bash "${temp}.1" + ret=$? + rm -f "${temp}.1" + if [ "$ret" != "0" ]; then + echo "$BOCASERVER: bad local status ($ret)" + rm -f "${temp}.cookie.txt" + exit 5 + fi else echo "" echo "$BOCASERVER: downloaded content is corrupted" @@ -87,7 +94,7 @@ if [ "$?" == "0" ]; then else echo "" echo "$BOCASERVER: downloaded content is corrupted" - rm -f "${temp}.1" + [ -f "$temp" ] && rm -f "$temp" rm -f "${temp}.cookie.txt" exit 4 fi diff --git a/tools/boca-fixes b/tools/boca-fixes index c24105d..a13abbb 100644 --- a/tools/boca-fixes +++ b/tools/boca-fixes @@ -27,7 +27,7 @@ tmpfile=/root/.boca-updates.$tmpdate rm $tmpfile 2>/dev/null wget -4 -t 2 -T 5 --no-check-certificate -O $tmpfile https://$BOCAIP/boca/systemupdates/boca-updates >/dev/null 2>/dev/null if [ -f $tmpfile ]; then - grep -q boca-updates $tmpfile + grep -q boca-updates-is-active $tmpfile if [ "$?" == "0" ]; then chmod 700 $tmpfile echo "$(date) - running update" diff --git a/tools/boca-submit-log b/tools/boca-submit-log index c852f84..dcbc678 100644 --- a/tools/boca-submit-log +++ b/tools/boca-submit-log @@ -16,7 +16,7 @@ if [ "$BOCASERVER" == "" ]; then fi if [[ ! -e "/root/submissions/code" ]]; then - echo "Machine not enabled to submit logs code is missing" + echo "Machine not enabled to submit logs - code is missing" exit 0 fi |