diff options
| author | Bruno Cesar Ribas <brunoribas@gmail.com> | 2018-11-05 19:23:17 +0000 |
|---|---|---|
| committer | Bruno Cesar Ribas <brunoribas@gmail.com> | 2018-11-05 19:23:17 +0000 |
| commit | 87cb46dc671b84a5cfcb665cb9f02e050595529b (patch) | |
| tree | 1543911f7934e1e775852a6fb1b5d7e6590beea5 /tools | |
| parent | d069fc757c591bda3cfabcd55ded730ff7d27348 (diff) | |
| parent | 336e0c032cc0f9e9547853f814ebffdfd00c5e2d (diff) | |
| download | boca-87cb46dc671b84a5cfcb665cb9f02e050595529b.tar.gz boca-87cb46dc671b84a5cfcb665cb9f02e050595529b.zip | |
Merge remote-tracking branch 'origin/develc' into devel
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/boca-submit-run | 6 | ||||
| -rwxr-xr-x | tools/boca-submit-run-root | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tools/boca-submit-run b/tools/boca-submit-run index d2455e2..8f53838 100755 --- a/tools/boca-submit-run +++ b/tools/boca-submit-run @@ -74,8 +74,12 @@ if [ -r "$5" ]; then fi nom=`echo -n "$5" | perl -MURI::Escape -lne 'print uri_escape($_)'` + if [ "$nom" != "$5" ]; then + echo "Invalid file name" + exit 1 + fi for BOCASERVER in `echo $BOCASERVERS | tr ';' ' '`; do - $runroot "$BOCASERVER" "$1" "$2" "$3" "$4" "`basename $5`" "$5" + $runroot "$BOCASERVER" "$1" "$2" "$3" "$4" "`basename $nom`" "$nom" done else echo "file $5 not found/readable" diff --git a/tools/boca-submit-run-root b/tools/boca-submit-run-root index ad94aad..686c5eb 100755 --- a/tools/boca-submit-run-root +++ b/tools/boca-submit-run-root @@ -46,9 +46,17 @@ if [ "$7" != "" ]; then tmpvar=`echo "$1" | tr -cd '[[:alnum:]]._+-/'` echo "BOCASERVER=$tmpvar" > "$nom" tmpvar=`echo "$2" | tr -cd '[[:alnum:]]._+-/'` + if [ -f "/root/submissions/user.ok" && "`cat /root/submissions/user.ok`" != "$tmpvar" ]; then + echo "WARNING: different username had been successfully used before - I will try to continue but you better check, this may fail later" + fi echo "user=$tmpvar" >> "$nom" + tmpuser=$tmpvar tmpvar=`echo "$3" | tr -cd '[[:alnum:]]._+-/'` + if [ -f "/root/submissions/pass.ok" && "`cat /root/submissions/pass.ok`" != "$tmpvar" ]; then + echo "WARNING: different password had been successfully used before - I will try to continue but you better check, this may fail later" + fi echo "pass=$tmpvar" >> "$nom" + tmppass=$tmpvar tmpvar=`echo "$4" | tr -cd '[[:alnum:]]._+-/'` echo "problem=$tmpvar" >> "$nom" tmpvar=`echo "$5" | tr -cd '[[:alnum:]]._+-/'` @@ -83,7 +91,9 @@ if [ "$7" != "" ]; then mv "$nom" "/root/submissions/`basename $nom .tmp`" echo "Run submission included in the queue -- it shall appear in the system later when connection is available" else - [ -f "$nom" ] && rm -f $nom + [ -f "$nom" ] && mv "$nom" "/root/submissions/`basename $nom .tmp`.processed" + echo -n "$tmpuser" > /root/submissions/user.ok + echo -n "$tmpvar" > /root/submissions/pass.ok fi fi fi |