Imrpove create scripts

helgi · Jan 27, 2012 · 5253ae0 · 5253ae0
1 parent a4ddf9c
commit 5253ae0
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 18 deletions.
diff --git a/autoload/create.php b/autoload/create.php
@@ -3,7 +3,7 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 autoload/create.php\n");
 }
 
-@unlink('project.phar');
+@unlink(__DIR__ . '/project.phar');
 $p = new Phar('project.phar', 0, 'project.phar');
 $p->buildFromDirectory(__DIR__);
 

diff --git a/cli/create.php b/cli/create.php
@@ -3,8 +3,8 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 cli/create.php\n");
 }
 
-@unlink('project.phar');
-$p = new Phar('project.phar', 0, 'project.phar');
+@unlink(__DIR__ . '/project.phar');
+$p = new Phar(__DIR__ . '/project.phar', 0, 'project.phar');
 $p->buildFromDirectory(__DIR__);
 
 $stub = <<<'EOD'

diff --git a/combo/create.php b/combo/create.php
@@ -3,7 +3,8 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 combo/create.php\n");
 }
 
-$p = new Phar('project.phar', 0, 'project.phar');
+@unlink(__DIR__ . '/project.phar');
+$p = new Phar(__DIR__ . '/project.phar', 0, 'project.phar');
 $p->buildFromDirectory(__DIR__);
 
 $stub = <<<'EOD'
@@ -14,10 +15,4 @@
 include "phar://" . __FILE__ . DIRECTORY_SEPARATOR . "cli.php";
 __HALT_COMPILER();
 EOD;
-$p->setStub($stub);
-
-	Phar::interceptFileFuncs();
-	Phar::mungServer(array('REQUEST_URI', 'PHP_SELF', 'SCRIPT_NAME'));
-	Phar::WebPhar(null, 'web.php');
-	include "phar://" . __FILE__ . DIRECTORY_SEPARATOR . "cli.php";
-	__HALT_COMPILER();
+$p->setStub($stub);
diff --git a/example2/create.php b/example2/create.php
@@ -3,7 +3,7 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 example2/create.php\n");
 }
 
-@unlink('project.phar');
-$p = new Phar('example2/project.phar');
+@unlink(__DIR__ . '/project.phar');
+$p = new Phar(__DIR__ . '/project.phar', 0, 'project.phar');
 $p['awesome.php'] = '<?php
 echo "Hi Phar people! :-) Example 2\n";';
diff --git a/example3/create.php b/example3/create.php
@@ -3,6 +3,6 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 example3/create.php\n");
 }
 
-@unlink('project.phar');
-$p = new Phar('example3/project.phar', 0, 'project.phar');
+@unlink(__DIR__ . '/project.phar');
+$p = new Phar(__DIR__ . '/project.phar', 0, 'project.phar');
 $p->buildFromDirectory(__DIR__);
diff --git a/phpmyadmin/phpmyadmin.php b/phpmyadmin/phpmyadmin.php
@@ -3,7 +3,7 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 phpmyadmin.php\n");
 }
 
-@unlink('phpmyadmin.phar');
+@unlink(__DIR__ . '/phpmyadmin.phar');
 $a = new Phar(__DIR__ . '/phpmyadmin.phar', 0, 'phpmyadmin.phar');
 $a->buildFromDirectory("phpMyAdmin-3.4.9-english");
 $a->startBuffering();

diff --git a/web/create.php b/web/create.php
@@ -3,8 +3,8 @@
 	die("Phar is in read-only mode, try php -d phar.readonly=0 web/create.php\n");
 }
 
-@unlink('project.phar');
-$p = new Phar('project.phar', 0, 'project.phar');
+@unlink(__DIR__ . '/project.phar');
+$p = new Phar(__DIR__ . '/project.phar', 0, 'project.phar');
 $p->buildFromDirectory(__DIR__);
 
 $stub = <<<'EOD'