From 3d8a0f6855f6634aeda073daea2b98e3a499d6f1 Mon Sep 17 00:00:00 2001 From: Zoffix Znet Date: Sat, 8 Sep 2018 09:36:59 -0400 Subject: [PATCH] [REAPP] Don't wait for commit trigger to restart the app We don't get that many non-app commits that it's a problem to hot-restart the app on ANY commit and the commit trigger is often forgotten, leading to extra commits being made just to update the app. Since update script and start-on-boot script are now identicall, I'm tossing the start-on-boot script and will update cron to use the other script on boot as well --- start-rakudo.org.sh | 25 ------------------------- update-rakudo.org.sh | 11 +++++------ 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100755 start-rakudo.org.sh diff --git a/start-rakudo.org.sh b/start-rakudo.org.sh deleted file mode 100755 index 01f1bd5..0000000 --- a/start-rakudo.org.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -. /var/www/rakudo.perl6.org/perl5/perlbrew/etc/bashrc -set -e -x -echo 'Starting rakudo.org update' -date -cd ~/rakudo.org/ - -git fetch -before=$(git rev-parse HEAD) -git checkout origin/master -after=$(git rev-parse HEAD) -cp update-rakudo.org.sh ../ -cp start-rakudo.org.sh ../ - -if [ "$before" != "$after" ] -then - echo "Got new commits" -fi - -echo "Starting the app" -set +e -hypnotoad app.pl -set -e - -echo 'Done' diff --git a/update-rakudo.org.sh b/update-rakudo.org.sh index cae6fe2..01f1bd5 100755 --- a/update-rakudo.org.sh +++ b/update-rakudo.org.sh @@ -15,12 +15,11 @@ cp start-rakudo.org.sh ../ if [ "$before" != "$after" ] then echo "Got new commits" - if [[ `git log "$before"..."$after" --oneline` =~ '[REAPP]' ]]; then - echo "Restarting app" - set +e - hypnotoad app.pl - set -e - fi fi +echo "Starting the app" +set +e +hypnotoad app.pl +set -e + echo 'Done'