diff options
Diffstat (limited to 'ext/phar')
| -rwxr-xr-x | ext/phar/Makefile.frag | 4 | ||||
| -rw-r--r-- | ext/phar/package.php | 1 | ||||
| -rw-r--r-- | ext/phar/package.xml | 2 | ||||
| -rwxr-xr-x | ext/phar/phar/pharcommand.inc | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index e34b7535d5..62ca834004 100755 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -5,9 +5,9 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re pharcmd: $(all_targets) $(builddir)/phar.php $(builddir)/phar.phar $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php - $(PHP_EXECUTABLE) $(srcdir)/build_precommand.php > $(builddir)/phar.php + $(SAPI_CLI_PATH) $(srcdir)/build_precommand.php > $(builddir)/phar.php $(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php - $(PHP_EXECUTABLE) -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/ + $(SAPI_CLI_PATH) -dphar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/ @chmod +x $(builddir)/phar.phar diff --git a/ext/phar/package.php b/ext/phar/package.php index 42fdfe8a49..d630718108 100644 --- a/ext/phar/package.php +++ b/ext/phar/package.php @@ -39,6 +39,7 @@ $options = array( 'Makefile.frag' => 'src', 'phar_path_check.re' => 'src', 'TODO' => 'doc', + 'phar.phar' => 'script', ), ); diff --git a/ext/phar/package.xml b/ext/phar/package.xml index f8a372527e..c1d2e5a869 100644 --- a/ext/phar/package.xml +++ b/ext/phar/package.xml @@ -172,7 +172,7 @@ avaiable then SHA-256 and SHA-512 signatures are supported as well.</description <file name="LICENSE" role="doc" /> <file name="Makefile.frag" role="src" /> <file name="phar.c" role="src" /> - <file name="phar.phar" role="data" /> + <file name="phar.phar" role="script" /> <file name="phar_internal.h" role="src" /> <file name="phar_object.c" role="src" /> <file name="phar_path_check.c" role="src" /> diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index 8fc50667b4..26dbc33853 100755 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc @@ -1192,11 +1192,13 @@ class PharCommand extends CLICommand if (isset($entry)) { if (!$phar[$entry]->hasMetadata()) { + echo 'No Metadata'; exit(1); } echo serialize($phar[$entry]->getMetadata()); } else { if (!$phar->hasMetadata()) { + echo 'No Metadata'; exit(1); } $meta = $phar->getMetadata(); @@ -1208,6 +1210,7 @@ class PharCommand extends CLICommand echo $meta[$index]; exit(0); } else { + echo 'No Metadata'; exit(1); } } else { |