[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1907-ge15d30a

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Jun 5 15:44:40 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  e15d30a92fb963e6e991f5c47eceb532e071a913 (commit)
      from  ff85ec6c2231a6cc20e7a79b4356c718e6c7a95e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e15d30a92fb963e6e991f5c47eceb532e071a913

commit e15d30a92fb963e6e991f5c47eceb532e071a913
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jun 5 13:44:33 2017 +0000

    avoid grep error status code if no match

diff --git a/src/post-install.d/common/service.inc b/src/post-install.d/common/service.inc
index 322df06..3e7958e 100644
--- a/src/post-install.d/common/service.inc
+++ b/src/post-install.d/common/service.inc
@@ -38,4 +38,4 @@ fi
 
 # detect the execution environment
 # are we running in docker container?
-is_docker=$(grep -c docker /proc/self/cgroup)
+is_docker=$(grep -c docker /proc/self/cgroup || true)

-----------------------------------------------------------------------

Summary of changes:
 src/post-install.d/common/service.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list