com web/doc: don't ask about the file overwrites and replace the bogus ../init.inc.php include paths: cron/weekly/howto
| From: | Ferenc Kovacs | Date: | Sun, 24 Feb 2013 19:57:49 +0000 |
| Subject: | com web/doc: don't ask about the file overwrites and replace the bogus ../init.inc.php include paths: cron/weekly/howto | ||
| Groups: | php.doc.web | ||
| Request: | Send a blank email to doc-web+get-2288@lists.php.net to get a copy of this message | ||
Commit: cae85680a2af593cd60139e54e2d1b6fa2ec0183
Author: Ferenc Kovacs <tyra3l@gmail.com> Sun, 24 Feb 2013 20:57:49 +0100
Parents: f66a556ade5dc3ad20620b4d5e9ee37bfce4b1ec
Branches: master
Link: http://git.php.net/?p=web/doc.git;a=commitdiff;h=cae85680a2af593cd60139e54e2d1b6fa2ec0183
Log:
don't ask about the file overwrites and replace the bogus ../init.inc.php include paths
Changed paths:
M cron/weekly/howto
Diff:
diff --git a/cron/weekly/howto b/cron/weekly/howto
index 8fbdb4a..9e3f73e 100755
--- a/cron/weekly/howto
+++ b/cron/weekly/howto
@@ -5,7 +5,11 @@
cd ${SVNDIR}/${DOCDIR}
php doc-base/configure.php --enable-howto
phd -d ${SVNDIR}/${DOCDIR}/doc-base/howto/.howto.xml --package PHP -f howto -o ${SVNDIR}/${DOCDIR}/
-mv php-howto/*.php ${DOCWEB}/www/dochowto/
+# the generated path is wrong:
+# http://git.php.net/?p=phd.git;a=blob;f=phpdotnet/phd/Package/PHP/HowTo.php;h=e06bfff451f4a947a41e493fc4f7252c21f130ca;hb=HEAD#l72
+# dochowto is under www/ while the include directory is on the same level as www, so it is two
level above dochowto
+sed -i -e 's/..\/include\/init.inc.php/..\/..\/include\/init.inc.php/g' php-howto/*.php
+mv -f php-howto/*.php ${DOCWEB}/www/dochowto/
#make howtotgz
#cp howto/howto.html.tar.gz ${DOCWEB}/www/dochowto