Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

p2pearを外部リポジトリに

  • Loading branch information...
commit 450817dbfb48ea89865a903e3c08642e45b4048a 1 parent 3310c77
@rsky authored
Showing with 15 additions and 8 deletions.
  1. +3 −0  .gitmodules
  2. +7 −7 README.md
  3. +4 −1 init.php
  4. +1 −0  p2pear
View
3  .gitmodules
@@ -0,0 +1,3 @@
+[submodule "p2pear"]
+ path = p2pear
+ url = git://github.com/rsky/p2-pear.git
View
14 README.md
@@ -16,10 +16,9 @@
cd p2-php</pre>
2. 依存ライブラリをダウンロード
- <pre>curl -L -O https://github.com/downloads/rsky/p2-php/p2pear.phar</pre>
- MD5 (p2pear.phar) = 5e02b3d21bccc7a23422f1c43d2d971f
- <pre>curl -O http://getcomposer.org/composer.phar
- php composer.phar install</pre>
+ <pre>git submodule update --init
+ curl -O http://getcomposer.org/composer.phar
+ php -d detect_unicode=0 composer.phar install</pre>
3. Webサーバが書き込めるようにディレクトリのアクセス権をセット
(CGI/suEXECIやCLI/Built-in web serverでは不要)
@@ -82,13 +81,14 @@ Webブラウザから変更できない項目は [conf/conf_admin.inc.php](https
git pull
-### p2pear.pharが古いとき
+### PEARライブラリ
- curl -L -O https://github.com/downloads/rsky/p2-php/p2pear.phar
+ git submodule foreach 'git pull origin master'
+ git submodule update
### composer.jsonが更新されたとき
- php composer.phar update
+ php -d detect_unicode=0 composer.phar update
## 古いバージョンからの移行
View
5 init.php
@@ -1,5 +1,8 @@
<?php
-if (file_exists(__DIR__ . '/p2pear.phar')) {
+if (is_dir(__DIR__ . '/p2pear/includes')) {
+ set_include_path(__DIR__ . '/p2pear/includes'
+ . PATH_SEPARATOR . get_include_path());
+} elseif (file_exists(__DIR__ . '/p2pear.phar')) {
set_include_path('phar://' . __DIR__ . '/p2pear.phar'
. PATH_SEPARATOR . get_include_path());
}
1  p2pear
@@ -0,0 +1 @@
+Subproject commit ed7f177ebb3e3e1ce38747148fa7b48be0e585a3
Please sign in to comment.
Something went wrong with that request. Please try again.