From 202dddaf206c8f52f227e54dd02e45931408cf0a Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Sun, 25 Oct 2015 13:15:48 -0400 Subject: [PATCH] fix permission issues on post commit, add charset to css --- controller/Actions.class.php | 5 +++-- web/scss/_global.scss | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/controller/Actions.class.php b/controller/Actions.class.php index 07b49964..c3454f8b 100644 --- a/controller/Actions.class.php +++ b/controller/Actions.class.php @@ -47,8 +47,9 @@ class Actions if ($payload['ref'] === 'refs/heads/master') { - shell_exec($_SERVER['ROOT_DIR'] . '/deploy.sh > /dev/null 2>/dev/null &'); - echo "Successful post commit."; + $ret = shell_exec('sudo -u lbry ' . $_SERVER['ROOT_DIR'] . '/update.sh 2>&1'); + echo "Successful post commit (aka the script executed, so maybe it is successful):\n"; + echo $ret; } return [null, []]; diff --git a/web/scss/_global.scss b/web/scss/_global.scss index 4bc8a20e..b64a487c 100644 --- a/web/scss/_global.scss +++ b/web/scss/_global.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + $spacing-vertical: 24px; $color-primary: #155B4A;