Skip to content

Commit f73ca97

Browse files
committed
Merge pull request #25 from loadsys/b/tweaks
B/tweaks
2 parents b36e128 + 7446e96 commit f73ca97

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "loadsys/cakephp-shell-scripts",
3-
"description": "This collection of scripts is intended to provide consistency and shortcuts for common project tasks (currently they are tuned for CakePHP v2.x projects, pre-Composer).",
3+
"description": "Reusable CakePHP project shell scripts.",
44
"license": "MIT",
55
"authors": [
66
{

docs-generate

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if [ "$1" = '-h' ]; then
2424
fi
2525

2626
DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
27+
BIN_DIR="${DIR}/bin"
2728
CFG_FILE="$DIR/Config/phpdoc.xml"
2829

2930
# Bail out if phpcs isn't available to us

set-owner

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ if [ -n "$1" ]; then
3131
ARG_OWNER=$1
3232
else
3333
# This works around the scripts being run elevated via `sudo`.
34-
# Can't use `stat -c|-f '%U %G' ./` because options are not standard across systems.
34+
# Can't use `stat -c'%U %G'|-f '%sU %sG' ./` because options are not standard across systems.
35+
36+
#@TODO: This method doesn't work when $DIR is a symlink with a name that doesn't match the target. Case study: eu.loadsysdev.com, the ~/public_html/ folder is really a symlink to /var/www/sites/eu.loadsysdev.com/html, and the owner of the symlink is root:root.
37+
3538
ARG_OWNER="$( \ls -l "${DIR}/.." | grep -v '^l' | grep " $(basename $( pwd ))\$" | awk '{ print $3 }' )"
3639
fi
3740

0 commit comments

Comments
 (0)