Page MenuHomePhabricator

D9969.diff
No OneTemporary

D9969.diff

diff --git a/scripts/daemon/exec/exec_daemon.php b/scripts/daemon/exec/exec_daemon.php
--- a/scripts/daemon/exec/exec_daemon.php
+++ b/scripts/daemon/exec/exec_daemon.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(dirname(__FILE__))));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../../__init_script__.php';
if (!posix_isatty(STDOUT)) {
$sid = posix_setsid();
diff --git a/scripts/sandpit/harden_directory.php b/scripts/sandpit/harden_directory.php
--- a/scripts/sandpit/harden_directory.php
+++ b/scripts/sandpit/harden_directory.php
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-require_once dirname(dirname(__FILE__)).'/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
// PhutilServiceProfiler::installEchoListener();
diff --git a/scripts/test/deferred_log.php b/scripts/test/deferred_log.php
--- a/scripts/test/deferred_log.php
+++ b/scripts/test/deferred_log.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$logs = array();
for ($ii = 0; $ii < $argv[1]; $ii++) {
diff --git a/scripts/test/http.php b/scripts/test/http.php
--- a/scripts/test/http.php
+++ b/scripts/test/http.php
@@ -1,21 +1,20 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->parseStandardArguments();
$args->parse(
array(
array(
- 'name' => 'attach',
- 'param' => 'file',
- 'help' => pht('Attach a file to the request.'),
+ 'name' => 'attach',
+ 'param' => 'file',
+ 'help' => pht('Attach a file to the request.'),
),
array(
- 'name' => 'url',
- 'wildcard' => true,
+ 'name' => 'url',
+ 'wildcard' => true,
),
));
@@ -26,9 +25,9 @@
}
$uri = head($uri);
-$method = 'GET';
-$data = '';
-$timeout = 30;
+$method = 'GET';
+$data = '';
+$timeout = 30;
$future = new HTTPSFuture($uri, $data);
$future->setMethod($method);
diff --git a/scripts/test/interactive_editor.php b/scripts/test/interactive_editor.php
--- a/scripts/test/interactive_editor.php
+++ b/scripts/test/interactive_editor.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline('test InteractiveEditor class');
diff --git a/scripts/test/lipsum.php b/scripts/test/lipsum.php
--- a/scripts/test/lipsum.php
+++ b/scripts/test/lipsum.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline('test context-free grammars');
@@ -15,8 +14,8 @@
$args->parse(
array(
array(
- 'name' => 'class',
- 'wildcard' => true,
+ 'name' => 'class',
+ 'wildcard' => true,
),
));
diff --git a/scripts/test/mime.php b/scripts/test/mime.php
--- a/scripts/test/mime.php
+++ b/scripts/test/mime.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline('test Filesystem::getMimeType()');
@@ -20,7 +19,7 @@
'help' => 'Use __mimetype__ as default instead of builtin default.',
),
array(
- 'name' => 'file',
+ 'name' => 'file',
'wildcard' => true,
),
));
diff --git a/scripts/test/paypal.php b/scripts/test/paypal.php
--- a/scripts/test/paypal.php
+++ b/scripts/test/paypal.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
// NOTE: These credentials are global test credentials provided by PayPal.
diff --git a/scripts/test/progress_bar.php b/scripts/test/progress_bar.php
--- a/scripts/test/progress_bar.php
+++ b/scripts/test/progress_bar.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->parseStandardArguments();
diff --git a/scripts/test/prompt.php b/scripts/test/prompt.php
--- a/scripts/test/prompt.php
+++ b/scripts/test/prompt.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline('test console prompting');
diff --git a/scripts/test/service_profiler.php b/scripts/test/service_profiler.php
--- a/scripts/test/service_profiler.php
+++ b/scripts/test/service_profiler.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
// Simple test script for PhutilServiceProfiler.
diff --git a/scripts/utils/directory_fixture.php b/scripts/utils/directory_fixture.php
--- a/scripts/utils/directory_fixture.php
+++ b/scripts/utils/directory_fixture.php
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-require_once dirname(dirname(__FILE__)).'/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline('edit directory fixtures');
diff --git a/scripts/utils/lock.php b/scripts/utils/lock.php
--- a/scripts/utils/lock.php
+++ b/scripts/utils/lock.php
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-require_once dirname(dirname(__FILE__)).'/__init_script__.php';
+require_once dirname(__FILE__).'/../__init_script__.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline('acquire and hold a lockfile');
diff --git a/support/parser/generate-type-parser.php b/support/parser/generate-type-parser.php
--- a/support/parser/generate-type-parser.php
+++ b/support/parser/generate-type-parser.php
@@ -1,8 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once dirname(__FILE__).'/../../scripts/__init_script__.php';
$terminals = array(
'|',

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 19, 6:15 PM (4 h, 1 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6621462
Default Alt Text
D9969.diff (6 KB)

Event Timeline