diff --git a/lab2/main.js b/lab2/main.js index 142163d9..2e159e75 100644 --- a/lab2/main.js +++ b/lab2/main.js @@ -12,7 +12,6 @@ class MailSystem { send(name, context) { console.log('--send mail to ' + name + '--'); // Interact with mail system and send mail - sleep(1000); // random success or failure const success = Math.random() > 0.5; if (success) { @@ -74,4 +73,9 @@ class Application { // app.selectNextPerson(); // app.selectNextPerson(); // app.selectNextPerson(); -// app.notifySelected(); \ No newline at end of file +// app.notifySelected(); + +module.exports = { + Application, + MailSystem, +}; \ No newline at end of file diff --git a/scripts/rebase-all.sh b/scripts/rebase-all.sh index 26eef16b..6e104473 100755 --- a/scripts/rebase-all.sh +++ b/scripts/rebase-all.sh @@ -12,18 +12,12 @@ for branch in $(git branch -r | grep -v HEAD); do echo "Checkout failed for branch $branch" exit 1 fi - git pull origin "$branch" - if [[ $? -ne 0 ]]; then - echo "Pull failed for branch $branch" - exit 1 - fi git rebase main if [[ $? -ne 0 ]]; then echo "Rebase failed for branch $branch" exit 1 fi - git push origin "$branch" fi done -git checkout main \ No newline at end of file +git checkout main