cvs: SVNROOT / run-conversion.php

gwynne Wed Jul 8 08:47:56 2009 UTC Modified files: /SVNROOT run-conversion.php Log: fix executable flags BEFORE installing the hooks so it actually works http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.70&r2=1.71&diff_format=u Index: SVNROOT/run-conversion.php diff -u SVNROOT/run-conversion.php:1.70 SVNROOT/run-conversion.php:1.71 --- SVNROOT/run-conversion.php:1.70 Wed Jul 8 08:36:33 2009 +++ SVNROOT/run-conversion.php Wed Jul 8 08:47:55 2009 @@ -7,7 +7,7 @@ // ----------------------------------------------------------------------------------------------------------------------------- // Constants -$version = substr('$Revision: 1.70 $', strlen('$Revision: '), -2); +$version = substr('$Revision: 1.71 $', strlen('$Revision: '), -2); $passes = array( 'svncreate', // Create various SVN repositories @@ -463,23 +463,14 @@ run_command("svn checkout " . escapeshellarg("file://{$GLOBALS['options']['svnroot']}/repository/SVNROOT/trunk") . ' ' . escapeshellarg("{$svnPath}/SVNROOT")); - v(2, "Installing start-commit hook...\n"); - @unlink("{$svnPath}/repository/hooks/start-commit"); - symlink("{$svnPath}/SVNROOT/start-commit", "{$svnPath}/repository/hooks/start-commit"); if (!is_executable("{$svnPath}/SVNROOT/start-commit")) { run_command("svn propset svn:executable 1 " . escapeshellarg("{$svnPath}/SVNROOT/start-commit")); } - v(2, "Installing pre-commit hook...\n"); - @unlink("{$svnPath}/repository/hooks/pre-commit"); - symlink("{$svnPath}/SVNROOT/pre-commit", "{$svnPath}/repository/hooks/pre-commit"); if (!is_executable("{$svnPath}/SVNROOT/pre-commit")) { run_command("svn propset svn:executable 1 " . escapeshellarg("{$svnPath}/SVNROOT/pre-commit")); } - v(2, "Installing post-commit hook...\n"); - @unlink("{$svnPath}/repository/hooks/post-commit"); - symlink("{$svnPath}/SVNROOT/post-commit", "{$svnPath}/repository/hooks/post-commit"); if (!is_executable("{$svnPath}/SVNROOT/post-commit")) { run_command("svn propset svn:executable 1 " . escapeshellarg("{$svnPath}/SVNROOT/post-commit")); } @@ -488,6 +479,18 @@ run_command("svn commit -m 'setting svn:executable for hooks' " . escapeshellarg("{$svnPath}/SVNROOT")); } + v(2, "Installing start-commit hook...\n"); + @unlink("{$svnPath}/repository/hooks/start-commit"); + symlink("{$svnPath}/SVNROOT/start-commit", "{$svnPath}/repository/hooks/start-commit"); + + v(2, "Installing pre-commit hook...\n"); + @unlink("{$svnPath}/repository/hooks/pre-commit"); + symlink("{$svnPath}/SVNROOT/pre-commit", "{$svnPath}/repository/hooks/pre-commit"); + + v(2, "Installing post-commit hook...\n"); + @unlink("{$svnPath}/repository/hooks/post-commit"); + symlink("{$svnPath}/SVNROOT/post-commit", "{$svnPath}/repository/hooks/post-commit"); + v(1, "Done installing global administrative files.\n"); }