Skip to content
This repository
Browse code

p2pearを外部リポジトリに

  • Loading branch information...
commit 450817dbfb48ea89865a903e3c08642e45b4048a 1 parent 3310c77
Ryusuke SEKIYAMA authored
3  .gitmodules
... ...
@@ -0,0 +1,3 @@
  1
+[submodule "p2pear"]
  2
+	path = p2pear
  3
+	url = git://github.com/rsky/p2-pear.git
14  README.md
Source Rendered
@@ -16,10 +16,9 @@
16 16
   cd p2-php</pre>
17 17
 
18 18
 2. 依存ライブラリをダウンロード
19  
-  <pre>curl -L -O https://github.com/downloads/rsky/p2-php/p2pear.phar</pre>
20  
-  MD5 (p2pear.phar) = 5e02b3d21bccc7a23422f1c43d2d971f
21  
-  <pre>curl -O http://getcomposer.org/composer.phar
22  
-  php composer.phar install</pre>
  19
+  <pre>git submodule update --init
  20
+  curl -O http://getcomposer.org/composer.phar
  21
+  php -d detect_unicode=0 composer.phar install</pre>
23 22
 
24 23
 3. Webサーバが書き込めるようにディレクトリのアクセス権をセット  
25 24
   (CGI/suEXECIやCLI/Built-in web serverでは不要)
@@ -82,13 +81,14 @@ Webブラウザから変更できない項目は [conf/conf_admin.inc.php](https
82 81
 
83 82
     git pull
84 83
 
85  
-### p2pear.pharが古いとき
  84
+### PEARライブラリ
86 85
 
87  
-    curl -L -O https://github.com/downloads/rsky/p2-php/p2pear.phar
  86
+    git submodule foreach 'git pull origin master'
  87
+    git submodule update
88 88
 
89 89
 ### composer.jsonが更新されたとき
90 90
 
91  
-    php composer.phar update
  91
+    php -d detect_unicode=0 composer.phar update
92 92
 
93 93
 
94 94
 ## 古いバージョンからの移行
5  init.php
... ...
@@ -1,5 +1,8 @@
1 1
 <?php
2  
-if (file_exists(__DIR__ . '/p2pear.phar')) {
  2
+if (is_dir(__DIR__ . '/p2pear/includes')) {
  3
+    set_include_path(__DIR__ . '/p2pear/includes'
  4
+                     . PATH_SEPARATOR . get_include_path());
  5
+} elseif (file_exists(__DIR__ . '/p2pear.phar')) {
3 6
     set_include_path('phar://' . __DIR__ . '/p2pear.phar'
4 7
                      . PATH_SEPARATOR . get_include_path());
5 8
 }
1  p2pear
... ...
@@ -0,0 +1 @@
  1
+Subproject commit ed7f177ebb3e3e1ce38747148fa7b48be0e585a3

0 notes on commit 450817d

Please sign in to comment.
Something went wrong with that request. Please try again.