Changeset 1414 for branches/locker-dev/locker/bin/fix-php-ini

Timestamp:

Jan 12, 2010, 11:55:27 PM (14 years ago)

Author:

ezyang

Message:

Merged in changes from trunk

--- Merging r1262 through r1413 into 'deploy/bin':
U    deploy/bin/django
   C deploy/bin/rails
   > Resolved by accepting working copy
--- Merging r1221 through r1413 into '.':
U    sql/bin/get-password
U    sql/bin/save-password
U    doc/tickets/rt.txt
U    doc/tickets/cnames.txt
U    bin/fix-php-ini
   C bin/scripts-rails
   > Resolved by accepting working copy
Skipped 'bin/for-each-server'
 U   bin
U    sbin/parallel-find.pl
U    sbin/commit-email.pl
U    sbin/commit-zephyr
Summary of conflicts:
  Tree conflicts: 2
  Skipped paths: 1

Location:

branches/locker-dev/locker

Files:

• . (modified) (1 prop)
• bin (modified) (1 prop)
• bin/fix-php-ini (modified) (1 diff)

branches/locker-dev/locker/bin/fix-php-ini

@@ -8 +8 @@
 if [ -f php.ini ]; then
         echo "Creating php.ini symlinks in child directories..."
-        athrun scripts gfind . -mindepth 1 -type d -exec sh -c 'ln -sf "`echo "$1" | sed '\''s,[^/],,g; s,/,../,g'\''`php.ini" "$1/"' -- {} \;
+        athrun scripts gfind . -mindepth 1 -type d \( -not -name .svn -not -name .git -or -not -prune \) -exec sh -c 'ln -sf "`echo "$1" | sed '\''s,[^/],,g; s,/,../,g'\''`php.ini" "$1/"' -- {} \;
         echo "Done!"
 else