Skip to content

Commit 7b03b33

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: updating instance Avoid backticks in shell scripts
2 parents 9ddaba3 + 9671b95 commit 7b03b33

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

setup/file_permissions.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ needed permissions:
3434
$ rm -rf app/cache/*
3535
$ rm -rf app/logs/*
3636
37-
$ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1`
37+
$ HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1)
3838
$ sudo chmod +a "$HTTPDUSER allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
39-
$ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
39+
$ sudo chmod +a "$(whoami) allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
4040
4141
3. Using ACL on a System that Supports ``setfacl`` (Linux/BSD)
4242
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,10 +48,10 @@ following script to determine your web server user and grant the needed permissi
4848

4949
.. code-block:: terminal
5050
51-
$ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1`
51+
$ HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1)
5252
# if this doesn't work, try adding `-n` option
53-
$ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:`whoami`:rwX app/cache app/logs
54-
$ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:`whoami`:rwX app/cache app/logs
53+
$ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs
54+
$ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs
5555
5656
.. note::
5757

templating/app_variable.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to Access the User, Request, Session & more in Twig via the ``app`` Variable
66

77
During each request, Symfony will set a global template variable ``app``
88
in both Twig and PHP template engines by default. The ``app`` variable
9-
is a :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables`
9+
is a :class:`Symfony\\Bridge\\Twig\\AppVariable`
1010
instance which will give you access to some application specific variables
1111
automatically:
1212

0 commit comments

Comments
 (0)