From b0e0e8eab2fd8eef491e1c95854eb54d0a47ed5e Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Fri, 7 Jul 2017 14:50:20 +0100
Subject: [PATCH] Check if script is being run via cron
---
roles/live2dev/templates/update.j2 | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/roles/live2dev/templates/update.j2 b/roles/live2dev/templates/update.j2
index 9973d7b..963de68 100644
--- a/roles/live2dev/templates/update.j2
+++ b/roles/live2dev/templates/update.j2
@@ -1,10 +1,14 @@
#!/bin/bash
-if [[ "${USER}" != "{{ item }}" ]]; then
- echo "This script should be run as {{ item }}, please sudo first"
- echo "sudo -u {{ item }} -s /bin/bash"
- echo "${0}"
- exit
+# $LOGNAME is set to {{ item }} when this script is run via cron and is
+# unset when run via a terminal
+if [[ "${LOGNAME}" != "{{ item }}" ]]; then
+ if [[ "${USER}" != "{{ item }}" ]]; then
+ echo "This script should be run as {{ item }}, please sudo first"
+ echo "sudo -u {{ item }} -s /bin/bash"
+ echo "${0}"
+ exit
+ fi
fi
cd /home/{{ item }}/sites
--
GitLab