Use consistent shebang #!/usr/bin/env php

diff --git a/agora/scripts/phorum2agora.php b/agora/scripts/phorum2agora.php
index 6976b8a..009bc91 100755 (executable)
--- a/agora/scripts/phorum2agora.php
+++ b/agora/scripts/phorum2agora.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Move basic messsage from phorum5 to agora preserving message ids

diff --git a/agora/scripts/upgrades/2007-09-23_last_message.php b/agora/scripts/upgrades/2007-09-23_last_message.php
index 35c1d18..e7ed9f1 100644 (file)
--- a/agora/scripts/upgrades/2007-09-23_last_message.php
+++ b/agora/scripts/upgrades/2007-09-23_last_message.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Upgrades last messages

diff --git a/ansel/scripts/ansel.php b/ansel/scripts/ansel.php
index 7ca27c0..78b8636 100755 (executable)
--- a/ansel/scripts/ansel.php
+++ b/ansel/scripts/ansel.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
 * This script interfaces with Ansel via the command-line

diff --git a/ansel/scripts/garbage_collection.php b/ansel/scripts/garbage_collection.php
index 6c5e2a8..0d9ba66 100755 (executable)
--- a/ansel/scripts/garbage_collection.php
+++ b/ansel/scripts/garbage_collection.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script looks for images in the VFS that have no pointer in the

diff --git a/ansel/scripts/recursive_import.php b/ansel/scripts/recursive_import.php
index 21a37b6..db10f1e 100755 (executable)
--- a/ansel/scripts/recursive_import.php
+++ b/ansel/scripts/recursive_import.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 /**
 * This script interfaces with Ansel via the command-line

diff --git a/folks/scripts/mail-filter.php b/folks/scripts/mail-filter.php
index 7a20060..013c9c1 100644 (file)
--- a/folks/scripts/mail-filter.php
+++ b/folks/scripts/mail-filter.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script parses MIME messages and deactivates users with returned emails.

diff --git a/framework/Icalendar/examples/Horde/Icalendar/parser.php b/framework/Icalendar/examples/Horde/Icalendar/parser.php
index 6f69c45..2bcc00a 100755 (executable)
--- a/framework/Icalendar/examples/Horde/Icalendar/parser.php
+++ b/framework/Icalendar/examples/Horde/Icalendar/parser.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Takes a filename on the command line and parses it, displaying what it

diff --git a/framework/Rpc/test/rpc-test.php b/framework/Rpc/test/rpc-test.php
index 3e25ab9..bb84790 100644 (file)
--- a/framework/Rpc/test/rpc-test.php
+++ b/framework/Rpc/test/rpc-test.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * @package Horde_Rpc

diff --git a/framework/SyncML/tests/testpacket.php b/framework/SyncML/tests/testpacket.php
index cfaf23f..ca73439 100755 (executable)
--- a/framework/SyncML/tests/testpacket.php
+++ b/framework/SyncML/tests/testpacket.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Script to test individual SyncML messages.

diff --git a/framework/SyncML/tests/testsync.php b/framework/SyncML/tests/testsync.php
index 7b1e322..e779433 100755 (executable)
--- a/framework/SyncML/tests/testsync.php
+++ b/framework/SyncML/tests/testsync.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Script to test the SyncML implementation.

diff --git a/framework/Text_Diff/docs/examples/diff.php b/framework/Text_Diff/docs/examples/diff.php
index 66914c2..9f7b014 100644 (file)
--- a/framework/Text_Diff/docs/examples/diff.php
+++ b/framework/Text_Diff/docs/examples/diff.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Text_Diff example script.

diff --git a/framework/XML_WBXML/tests/decode.php b/framework/XML_WBXML/tests/decode.php
index 45e9c5b..d1c6a27 100755 (executable)
--- a/framework/XML_WBXML/tests/decode.php
+++ b/framework/XML_WBXML/tests/decode.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Tests all .wbxml files in ../docs/examples/ by decoding them and

diff --git a/hermes/scripts/purge.php b/hermes/scripts/purge.php
index 81680ba..378e889 100755 (executable)
--- a/hermes/scripts/purge.php
+++ b/hermes/scripts/purge.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Copyright 2002-2010 The Horde Project (http://www.horde.org/)

diff --git a/horde/scripts/import_squirrelmail_file_prefs.php b/horde/scripts/import_squirrelmail_file_prefs.php
index f287ea1..c5b6af8 100755 (executable)
--- a/horde/scripts/import_squirrelmail_file_prefs.php
+++ b/horde/scripts/import_squirrelmail_file_prefs.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports SquirrelMail file-based preferences into Horde.

diff --git a/horde/scripts/import_squirrelmail_sql_prefs.php b/horde/scripts/import_squirrelmail_sql_prefs.php
index f0516d0..45f546f 100755 (executable)
--- a/horde/scripts/import_squirrelmail_sql_prefs.php
+++ b/horde/scripts/import_squirrelmail_sql_prefs.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports SquirrelMail database preferences into Horde.

diff --git a/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php b/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php
index 2a1e631..86a3333 100755 (executable)
--- a/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php
+++ b/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This is a script to migrate SyncML anchor information out of the datatree

diff --git a/horde/scripts/upgrades/convert_datatree_groups_to_sql.php b/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
index 3a7ef69..e5a0c09 100755 (executable)
--- a/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
+++ b/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 /**
  * A script to migrate groups from the DataTree backend to the new

diff --git a/horde/scripts/upgrades/convert_datatree_perms_to_sql.php b/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
index e745885..af9e8c2 100755 (executable)
--- a/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
+++ b/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 /**
  * A script to migrate permissions from the DataTree backend to the

diff --git a/horde/scripts/upgrades/migrate_user_categories.php b/horde/scripts/upgrades/migrate_user_categories.php
index 8219860..5674940 100755 (executable)
--- a/horde/scripts/upgrades/migrate_user_categories.php
+++ b/horde/scripts/upgrades/migrate_user_categories.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 /**
  * A script to update users preferences to combine their categories

diff --git a/horde/scripts/upgrades/move_history_out_of_datatree.php b/horde/scripts/upgrades/move_history_out_of_datatree.php
index 9a1ade8..b423a56 100755 (executable)
--- a/horde/scripts/upgrades/move_history_out_of_datatree.php
+++ b/horde/scripts/upgrades/move_history_out_of_datatree.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This is a script to migrate History information out of the datatree

diff --git a/hylax/scripts/fax_create.php b/hylax/scripts/fax_create.php
index a586f55..50522ec 100755 (executable)
--- a/hylax/scripts/fax_create.php
+++ b/hylax/scripts/fax_create.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';

diff --git a/hylax/scripts/fax_create_recv.php b/hylax/scripts/fax_create_recv.php
index f4fcaba..5bfe627 100755 (executable)
--- a/hylax/scripts/fax_create_recv.php
+++ b/hylax/scripts/fax_create_recv.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';

diff --git a/hylax/scripts/fax_save_data.php b/hylax/scripts/fax_save_data.php
index 44cc34b..816d233 100755 (executable)
--- a/hylax/scripts/fax_save_data.php
+++ b/hylax/scripts/fax_save_data.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';

diff --git a/hylax/scripts/fax_save_recv_data.php b/hylax/scripts/fax_save_recv_data.php
index f8c8a95..601f657 100755 (executable)
--- a/hylax/scripts/fax_save_recv_data.php
+++ b/hylax/scripts/fax_save_recv_data.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';

diff --git a/hylax/scripts/install_cups_drivers.php b/hylax/scripts/install_cups_drivers.php
index a228a73..e9a0eb9 100755 (executable)
--- a/hylax/scripts/install_cups_drivers.php
+++ b/hylax/scripts/install_cups_drivers.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';

diff --git a/imp/scripts/bounce_spam.php b/imp/scripts/bounce_spam.php
index dbd3c87..2bdbb64 100755 (executable)
--- a/imp/scripts/bounce_spam.php
+++ b/imp/scripts/bounce_spam.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script bounces a message back to the sender and can be used with IMP's

diff --git a/ingo/scripts/upgrades/convert_prefs_to_sql.php b/ingo/scripts/upgrades/convert_prefs_to_sql.php
index 090eff4..d575e6c 100755 (executable)
--- a/ingo/scripts/upgrades/convert_prefs_to_sql.php
+++ b/ingo/scripts/upgrades/convert_prefs_to_sql.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Converts a user's filter rules from the preferences storage backend to the

diff --git a/jonah/scripts/feed_tester.php b/jonah/scripts/feed_tester.php
index 9cb386d..ed69679 100755 (executable)
--- a/jonah/scripts/feed_tester.php
+++ b/jonah/scripts/feed_tester.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 /**
  * See the enclosed file LICENSE for license information (BSD). If you

diff --git a/kronolith/scripts/import_icals.php b/kronolith/scripts/import_icals.php
index 3acf249..2751ae7 100755 (executable)
--- a/kronolith/scripts/import_icals.php
+++ b/kronolith/scripts/import_icals.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports iCalendar/vCalendar data into Kronolith calendars.

diff --git a/kronolith/scripts/import_squirrelmail_calendar.php b/kronolith/scripts/import_squirrelmail_calendar.php
index 2aedb49..b0ace25 100755 (executable)
--- a/kronolith/scripts/import_squirrelmail_calendar.php
+++ b/kronolith/scripts/import_squirrelmail_calendar.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports SquirrelMail database calendars into Kronolith.

diff --git a/kronolith/scripts/upgrades/convert_to_utc.php b/kronolith/scripts/upgrades/convert_to_utc.php
index 58f1c7c..970bf2c 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_to_utc.php
+++ b/kronolith/scripts/upgrades/convert_to_utc.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script converts all dates from the user's timezone to UTC.

diff --git a/mnemo/scripts/import_text_note.php b/mnemo/scripts/import_text_note.php
index 8fff10a..7484ef8 100755 (executable)
--- a/mnemo/scripts/import_text_note.php
+++ b/mnemo/scripts/import_text_note.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports vNote data into Mnemo notepads.

diff --git a/mnemo/scripts/import_vnotes.php b/mnemo/scripts/import_vnotes.php
index 09190dc..ae42195 100755 (executable)
--- a/mnemo/scripts/import_vnotes.php
+++ b/mnemo/scripts/import_vnotes.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports vNote data into Mnemo notepads.

diff --git a/mnemo/scripts/upgrades/convert_to_utf8.php b/mnemo/scripts/upgrades/convert_to_utf8.php
index 222c4ae..b9f3ac1 100755 (executable)
--- a/mnemo/scripts/upgrades/convert_to_utf8.php
+++ b/mnemo/scripts/upgrades/convert_to_utf8.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script converts the data in an SQL backend from any supported charset

diff --git a/nag/scripts/import_vtodos.php b/nag/scripts/import_vtodos.php
index 0ddcbc1..9b45a5f 100755 (executable)
--- a/nag/scripts/import_vtodos.php
+++ b/nag/scripts/import_vtodos.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports vTodo data into Nag tasklists.

diff --git a/nag/scripts/upgrades/create_missing_add_histories_sql.php b/nag/scripts/upgrades/create_missing_add_histories_sql.php
index ed1f62f..b5355df 100755 (executable)
--- a/nag/scripts/upgrades/create_missing_add_histories_sql.php
+++ b/nag/scripts/upgrades/create_missing_add_histories_sql.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Copyright 2005-2010 The Horde Project (http://www.horde.org/)

diff --git a/trean/scripts/url_cron.php b/trean/scripts/url_cron.php
index e5fb797..d3c03af 100644 (file)
--- a/trean/scripts/url_cron.php
+++ b/trean/scripts/url_cron.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * $Horde: trean/scripts/check_links.php,v 1.30 2009/01/06 18:02:14 jan Exp $

diff --git a/turba/scripts/import_squirrelmail_file_abook.php b/turba/scripts/import_squirrelmail_file_abook.php
index 1c4ce12..b2cbaed 100755 (executable)
--- a/turba/scripts/import_squirrelmail_file_abook.php
+++ b/turba/scripts/import_squirrelmail_file_abook.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports SquirrelMail file-based addressbooks into Turba.

diff --git a/turba/scripts/import_squirrelmail_sql_abook.php b/turba/scripts/import_squirrelmail_sql_abook.php
index 2a9c6c2..a838676 100755 (executable)
--- a/turba/scripts/import_squirrelmail_sql_abook.php
+++ b/turba/scripts/import_squirrelmail_sql_abook.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports SquirrelMail database addressbooks into Turba.

diff --git a/turba/scripts/import_vcards.php b/turba/scripts/import_vcards.php
index f2c666e..69590e7 100755 (executable)
--- a/turba/scripts/import_vcards.php
+++ b/turba/scripts/import_vcards.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script imports VCARD data into turba address books.

diff --git a/turba/scripts/upgrades/public_to_horde_share.php b/turba/scripts/upgrades/public_to_horde_share.php
index 8f097b5..db0b6c1 100755 (executable)
--- a/turba/scripts/upgrades/public_to_horde_share.php
+++ b/turba/scripts/upgrades/public_to_horde_share.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Script to migrate an existing 'public' Turba address book to the

diff --git a/vilma/scripts/create_mailboxes.php b/vilma/scripts/create_mailboxes.php
index e274544..e5e34e1 100644 (file)
--- a/vilma/scripts/create_mailboxes.php
+++ b/vilma/scripts/create_mailboxes.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script will check the user table and create any mail directories on the

diff --git a/whups/scripts/bugzilla-import.php b/whups/scripts/bugzilla-import.php
index e56bcfd..ff05b19 100755 (executable)
--- a/whups/scripts/bugzilla-import.php
+++ b/whups/scripts/bugzilla-import.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Bugzilla Import Script.

diff --git a/whups/scripts/obliterate.php b/whups/scripts/obliterate.php
index 88e5fd0..ea7d11a 100755 (executable)
--- a/whups/scripts/obliterate.php
+++ b/whups/scripts/obliterate.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Obliterate Whups Data.

diff --git a/wicked/scripts/convert_to_utf8.php b/wicked/scripts/convert_to_utf8.php
index 9ef9704..d1201e6 100755 (executable)
--- a/wicked/scripts/convert_to_utf8.php
+++ b/wicked/scripts/convert_to_utf8.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * This script converts the data in an SQL backend from any supported charset

diff --git a/wicked/scripts/mail-filter.php b/wicked/scripts/mail-filter.php
index 5c310db..dab60a8 100755 (executable)
--- a/wicked/scripts/mail-filter.php
+++ b/wicked/scripts/mail-filter.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /*
  * This script accepts a MIME message on standard input and creates a new

diff --git a/wicked/scripts/wicked.php b/wicked/scripts/wicked.php
index 7f4ce54..de77677 100755 (executable)
--- a/wicked/scripts/wicked.php
+++ b/wicked/scripts/wicked.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 /**
 * This script interfaces with Wicked via the command-line