archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix two issues with shell/config scripts for hosted repositories

Browse Source 
Summary: Ref T4151. `-ne` is numeric in some/most/all shells; `exec --` apparently doens't always work.

Test Plan: Will make @zeeg test.

Reviewers: btrahan, zeeg

Reviewed By: zeeg

CC: zeeg, aran

Maniphest Tasks: T4151

Differential Revision: https://secure.phabricator.com/D7702
This commit is contained in:
epriestley
2013-12-04 16:45:54 -08:00
parent ff4e965c90
commit e77d5012be
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/sshd/phabricator-ssh-hook.sh
View File

@@ -6,7 +6,7 @@ VCSUSER="vcs-user"
# NOTE: Replace this with the path to your Phabricator directory. # NOTE: Replace this with the path to your Phabricator directory.
ROOT="/path/to/phabricator" ROOT="/path/to/phabricator"
if [ "$1" -ne "$VCSUSER" ]; if [ "$1" != "$VCSUSER" ];
then then
exit 1 exit 1
fi fi

2
src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
View File

@@ -162,7 +162,7 @@ final class PhabricatorRepositoryPullEngine
$root = dirname(phutil_get_library_root('phabricator')); $root = dirname(phutil_get_library_root('phabricator'));
$bin = $root.'/bin/commit-hook'; $bin = $root.'/bin/commit-hook';
$cmd = csprintf('exec -- %s %s "$@"', $bin, $callsign); $cmd = csprintf('exec %s %s "$@"', $bin, $callsign);
$hook = "#!/bin/sh\n{$cmd}\n"; $hook = "#!/bin/sh\n{$cmd}\n";