PyukiWiki CVS Commit
pyuki****@lists*****
2012年 1月 28日 (土) 23:22:13 JST
Index: PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt diff -u PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt:1.3 PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt:1.4 --- PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt:1.3 Sat Jan 28 02:47:59 2012 +++ PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt Sat Jan 28 23:22:12 2012 @@ -7,16 +7,16 @@ License: GPL version 2 or (at your option) any later version and/or Artistic version 1 or later version. Based on YukiWiki http://www.hyuki.com/yukiwiki/ - and PukiWiki http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/ + and PukiWiki http://pukiwiki.sfjp.jp/ URL: http://nekyo.qp.land.to/ - http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/ + http://pyukiwiki.sfjp.jp/ MAIL: ãªãªã¿ <nanami (at) daiba (dot) cx> (注：ãƒã‚«ãƒžã§ã™) - $Id: CGI_INSTALLER.ja.txt,v 1.3 2012/01/27 17:47:59 papu Exp $ + $Id: CGI_INSTALLER.ja.txt,v 1.4 2012/01/28 14:22:12 papu Exp $ ã“ã®ãƒ†ã‚ストファイルã¯UTF-8ã€TAB4ã§è¨˜è¿°ã•ã‚Œã¦ã„ã¾ã™ã€‚ @@ -25,7 +25,7 @@ ------------------------------------------------- 以下ã®URLã§æœ€æ–°æƒ…å ±ã‚’å…¥æ‰‹ã—ã¦ãã ã•ã„。 http://nekyo.qp.land.to/ -http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/ +http://pyukiwiki.sfjp.jp/ ------------------------------------------------- â– CGIインストーラã«ã¤ã„㦠@@ -177,12 +177,12 @@ ・CGI.pmãŒå°Žå…¥ã•ã‚Œã¦ã„ãªã„サーãƒãƒ¼ã§ã¯ã€åˆ¥é€”é…布ã•ã‚Œã¦ã„ã‚‹CGI.pm.zipを解å‡ã—㦠　lib 以下ã«ç½®ã„ã¦ä¸‹ã•ã„。 -　http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/PyukiWiki/Download ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚ +　http://pyukiwiki.sfjp.jp/PyukiWiki/Download ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚ ・utf8ã«ã—ãŸã‚‰æ–‡å—化ã‘ã™ã‚‹ï¼ŸPukiWikiå®›ã¦ã®InterWikiãŒæ£å¸¸ã§ã¯ãªã„？ 　perl5.8.0以å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã‹ã¤ã‚µãƒ¼ãƒãƒ¼ä¸Šã«JcodeãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。 　代替ã®Jcode.pm 0.88をインストールã—ã¦ä¸‹ã•ã„。 -　http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/cgi-bin/w/PyukiWiki/Download ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚ +　http://pyukiwiki.sfjp.jp/cgi-bin/w/PyukiWiki/Download ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚ ------------------------------------------------- ■アップデート版ã«ãŠã„ã¦ã®è¿½è¨˜ Index: PyukiWiki-Devel-UTF8/build/installer.sh diff -u PyukiWiki-Devel-UTF8/build/installer.sh:1.4 PyukiWiki-Devel-UTF8/build/installer.sh:1.5 --- PyukiWiki-Devel-UTF8/build/installer.sh:1.4 Sat Jan 28 01:48:02 2012 +++ PyukiWiki-Devel-UTF8/build/installer.sh Sat Jan 28 23:22:12 2012 @@ -14,13 +14,18 @@ export VER="__PYUKIWIKIVERSION__" export BUILD="__BUILD__" export CODE="__CODE__" -export S=".subshell" -export I=".installer" +export X="installer_sub.sh" +export S=".installertarball" +export I=".installimagetarball" +export httpheader="Content-type: text/html;charset=utf-8" + err() { if [ $CGI = 1 ]; then if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then cat <<EOF +$httpheader + <html><head><title>PyukiWikiインストーラ</title></head> <body><h2>PyukiWikiインストーラ エラー</h2> <hr> @@ -31,6 +36,8 @@ EOF else cat <<EOF +$httpheader + <html><head><title>PyukiWiki Installer</title></head> <body><h2>PyukiWiki Installer</h2> <hr> @@ -101,13 +108,27 @@ fi if [ $CGI = 1 ]; then - echo Content-type: text/html;charset=utf-8 - echo - echo + cat <<EOF +$httpheader + +EOF chk - if [ "`echo $QUERY_STRING|grep install`" = "" ] ; then + if [ "$QUERY_STRING" = "" ]; then + SHELLEXEC=cgistart + fi + if [ "`echo $QUERY_STRING|grep license`" != "" ]; then + SHELLEXEC=license + fi + if [ "`echo $QUERY_STRING|grep step1`" != "" ]; then + SHELLEXEC=gpl + fi + if [ "`echo $QUERY_STRING|grep step2`" != "" ]; then + SHELLEXEC=art + fi + if [ "`echo $QUERY_STRING|grep step3`" != "" ]; then SHELLEXEC=cgititle - else + fi + if [ "`echo $QUERY_STRING|grep install`" != "" ]; then SHELLEXEC=cgiinstall fi else Index: PyukiWiki-Devel-UTF8/build/installer2.sh diff -u PyukiWiki-Devel-UTF8/build/installer2.sh:1.1 PyukiWiki-Devel-UTF8/build/installer2.sh:1.2 --- PyukiWiki-Devel-UTF8/build/installer2.sh:1.1 Sat Jan 28 01:11:29 2012 +++ PyukiWiki-Devel-UTF8/build/installer2.sh Sat Jan 28 23:22:12 2012 @@ -1,8 +1,11 @@ -cp $S $S.$TXTEXT -rm $S -$TXTCMD -o $S.$ARCEXT $S.$TXTEXT -$ARCCMD $S.$ARCEXT -if [ "$SHELLEXEC" != "" ]; then - $SH $S $SHELLEXEC $0 +cp $S $S.$TXTEXT >/dev/null 2>/dev/null +rm -f $S +$TXTCMD -o $S.$ARCEXT $S.$TXTEXT >/dev/null 2>/dev/null +$ARCCMD $S.$ARCEXT >/dev/null 2>/dev/null +$TARCMD $TAROPT $S >/dev/null 2>/dev/null +if [ -f $S ]; then + if [ "$SHELLEXEC" != "" ]; then + $SH $X $SHELLEXEC $0 + fi fi -#rm -f $S $S.$TXTEXT $S.$ARCEXT +rm -f $X *.html $S $S.$TXTEXT $S.$ARCEXT $I $I.$TXTEXT $I.$ARCEXT Index: PyukiWiki-Devel-UTF8/build/installer_sub.sh diff -u PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.1 PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.2 --- PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.1 Sat Jan 28 01:11:29 2012 +++ PyukiWiki-Devel-UTF8/build/installer_sub.sh Sat Jan 28 23:22:12 2012 @@ -1,22 +1,195 @@ #!/bin/sh + CMD=$1 MYCMD=$2 -$head_ja='<html><head><title>PyukiWikiインストーラ</title><link rel="stylesheet" href="http://pyukiwiki.sourceforge.jp/skin/pyukiwiki.default.css" type="text/css" media="screen" charset="EUC-JP"></head>' -$head_en='<html><head><title>PyukiWiki Installer</title><link rel="stylesheet" href="http://pyukiwiki.sourceforge.jp/skin/pyukiwiki.default.css" type="text/css" media="screen" charset="EUC-JP"></head>' +DOCTYPE='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' + +HEADJA='<html><head><title>PyukiWikiインストーラ</title><link rel="stylesheet" href="http://pyukiwiki.sourceforge.jp/skin/pyukiwiki.default.css" type="text/css" media="screen" charset="EUC-JP"></head>' + +HEADEN='<html><head><title>PyukiWiki Installer</title><link rel="stylesheet" href="http://pyukiwiki.sourceforge.jp/skin/pyukiwiki.default.css" type="text/css" media="screen" charset="EUC-JP"></head>' + +FOOTJA='<hr><div id="footer"><strong><a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Installer \@\@PYUKIVER\@\@">PyukiWiki Installer \@\@PYUKIVER\@\@</a></strong>Copyright© 2004-\@\@YEAR\@\@ by <a href="\@\@NEKYO_URL\@\@" class="link" title="Nekyo">Nekyo</a>, <a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="\@\@GPLJP_URL\@\@" class="link" title="GPL">GPL</a>, <a href="\@\@ARTISTICJP_URL\@\@" class="link" title="Artistic">Artistic</a><br>Based on "<a href="\@\@YUKIWIKI_URL\@\@" class="link" title="YukiWiki">YukiWiki</a>" 2.1.0 by <a href="\@\@YUKI_URL\@\@" class="link" title="yuki">yuki</a>and <a href="\@\@PUKIWIKI_URL\@\@" class="link" title="PukiWiki">PukiWiki</a> by <a href="\@\@PUKIWIKI_URL\@\@" class="link" title="PukiWiki Developers Term">\@\@PUKIWIKIDEV_URL\@\@</a><br></div></div></div></body></html>' + +FOOTEN='<hr><div id="footer"><strong><a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Installer \@\@PYUKIVER\@\@">PyukiWiki Installer \@\@PYUKIVER\@\@</a></strong>Copyright© 2004-\@\@YEAR\@\@ by <a href="\@\@NEKYO_URL\@\@" class="link" title="Nekyo">Nekyo</a>, <a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="\@\@GPL_URL\@\@" class="link" title="GPL">GPL</a>, <a href="\@\@ARTISTIC_URL\@\@" class="link" title="Artistic">Artistic</a><br>Based on "<a href="\@\@YUKIWIKI_URL\@\@" class="link" title="YukiWiki">YukiWiki</a>" 2.1.0 by <a href="\@\@YUKI_URL\@\@" class="link" title="yuki">yuki</a>and <a href="\@\@PUKIWIKI_URL\@\@" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">\@\@PUKIWIKIDEV_URL\@\@</a><br></div></div></div></body></html>' + +getversion() { + # pyukiwiki + if [ -f $F ]; then + V=`grep \$::version $F` + OLDVERSION="" + if [ "$V" != "" ]; then + OLDVERSION=`perl -e '$V;print \$::version;'` + OLDVERSION="PyukiWiki version $OLDVERSION" + else + # pukiwiki + V=`grep S_VERSION $F` + if [ "$V" != "" ]; then + OLDVERSION=`echo $V|sed -e 's/.*S_VERSION//g'|sed -e "s/'//g"|sed -e "s/,//g"|sed -e "s/ //g"|sed -e "s/\(//g"|sed -e "s/\)//g|sed -e "s/;//g""` + OLDVERSION="PukiWiki version $OLDVERSION" + fi + fi + fi +} + +updatecheck() { + UPDATEFLAG=0 + if [ "`ls index.cgi 2>/dev/null``ls nph-index.cgi 2>/dev/null``ls index.php 2>/dev/null`" == "" ]; then + F=lib/wiki.cgi + getversion + UPDATEFLAG=3 + if [ "$OLDVERSION" != "" ]; then + F=index.cgi + getversion + UPDATEFLAG=2 + fi + if [ "$OLDVERSION" != "" ]; then + F=lib/init.php + getversion + UPDATEFLAG=1 + fi + if [ "$OLDVERSION" != "" ]; then + OLDVERSION="Other script" + UPDATEFLAG=-1 + fi + fi +} + +if [ "$CMD" = "cgistart" ]; then + if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then + echo $DOCTYPE + echo $HEADJA + cat <<EOF +<body><h2>PyukiWikiインストーラ</h2> +<table> +<tr><td colspan="2"> +PyukiWikiをインストールã—ã¾ã™ã€‚<br> +「次ã¸ã€ã‚’押ã—ã¦ä¸‹ã•ã„。 +<div align="left"> +<form action="$SCRIPT_NAME" method="GET"> +<input type="submit" name="step1" value="次ã¸"> +</form></div> +</td></tr> +</table> +EOF + echo $FOOTJA + else + echo $DOCTYPE + echo $HEADEN + cat <<EOF +<body><h2>PyukiWiki Installer</h2> +<table> +<tr><td colspan="2"> +Install PyukiWiki.<br> +Press "Next" +<div align="left"> +<form action="$0" method="GET"> +<input type="submit" name="step1" value="Next"> +</form></div> +</td></tr> +</table> +EOF + echo $FOOTEN + fi +fi + +if [ "$CMD" = "gpl" ]; then + if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then + echo $DOCTYPE + echo $HEADJA + cat <<EOF +<body><h2>PyukiWikiインストーラ</h2> +<table> +<tr><td colspan="2"> +<iframe src="$SCRIPT_NAME?license_gpl_ja" width="800" height="300"></iframe> +<div align="left"> +<form action="$SCRIPT_NAME" method="GET"> +<input type="submit" name="noagreement" value="åŒæ„ã—ãªã„"> +<input type="submit" name="step2" value="åŒæ„ã™ã‚‹"> +</form></div> +</td></tr> +</table> +EOF + echo $FOOTJA + else + echo $DOCTYPE + echo $HEADEN + cat <<EOF +<body><h2>PyukiWiki Installer</h2> +<table> +<tr><td colspan="2"> +<iframe src="$SCRIPT_NAME?license_gpl_en" width="800" height="300"></iframe> +<div align="left"> +<form action="$SCRIPT_NAME" method="GET"> +<input type="submit" name="noagreement" value="Disagree"> +<input type="submit" name="step2" value="Agreement"> +</form></div> +</td></tr> +</table> +EOF + echo $FOOTEN + fi +fi + +if [ "$CMD" = "art" ]; then + if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then + echo $DOCTYPE + echo $HEADJA + cat <<EOF +<body><h2>PyukiWikiインストーラ</h2> +<table> +<tr><td colspan="2"> +<iframe src="$SCRIPT_NAME?license_art_ja" width="800" height="300"></iframe> +<div align="left"> +<form action="$SCRIPT_NAME" method="GET"> +<input type="submit" name="noagreement" value="Disagree"> +<input type="submit" name="step3" value="Agreement"> +</form></div> +</td></tr> +</table> +EOF + echo $FOOTJA + else + echo $DOCTYPE + echo $HEADEN + cat <<EOF +<body><h2>PyukiWiki Installer</h2> +<table> +<tr><td colspan="2"> +<iframe src="$SCRIPT_NAME?license_art_en" width="800" height="300"></iframe> +<div align="left"> +<form action="$SCRIPT_NAME" method="GET"> +<input type="submit" name="noagreement" value="Disagree"> +<input type="submit" name="step3" value="Agreement"> +</form></div> +</td></tr> +</table> +EOF + echo $FOOTEN + fi +fi + +if [ "$CMD" = "license" ]; then + echo $httpheader + echo + cat $QUERY_STRING.html + exit +fi if [ "$CMD" = "cgititle" ]; then + UPDATEHTML="" if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then + echo $DOCTYPE + echo $HEADJA cat <<EOF -$head_ja <body><h2>PyukiWikiインストーラ</h2> <table> <tr><td colspan="2"> PyukiWikiã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®æº–å‚™ã¯å®Œäº†ã—ã¾ã—ãŸã€‚<br> インストールをクリックã™ã‚‹ã¨ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ã¾ã™ã€‚ <div align="left"> -<form action="$0" method="GET"> +<form action="$SCRIPT_NAME" method="GET"> <input type="submit" name="install" value="インストール（通常インストール）"> <input type="submit" name="secureinstall" value="ã‚»ã‚ュアインストール（パーミッションを厳密ã«è¨å®šã™ã‚‹ï¼‰"> </form></div> @@ -25,15 +198,16 @@ <tr><td>インストールã™ã‚‹ãƒ‘ス:</td> <td>$PWD</td></tr> <tr><td>インストールã™ã‚‹PyukiWikiã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³:</td> -<td>$VER$BUILD ($CODE)</td></tr> +<td>$VER$BUILD ($CODE)$UPDATEHTML</td></tr> <tr><td>解å‡ã‚³ãƒžãƒ³ãƒ‰:</td> <td>$TXTCMD $ARCCMD $TARCMD</td></tr> </table> -</body></html> EOF + echo $FOOTJA else + echo $DOCTYPE + echo $HEADEN cat <<EOF -$head_en <body><h2>PyukiWiki Installer</h2> <table> <tr><td colspan="2"> @@ -49,12 +223,12 @@ <tr><td>Target Path:</td> <td>$PWD</td></tr> <tr><td>PyukiWiki Version:</td> -<td>$VER$BUILD ($CODE)</td></tr> +<td>$VER$BUILD ($CODE)$UPDATEHTML</td></tr> <tr><td>Extract comomand:</td> <td>$TXTCMD $ARCCMD $TARCMD</td></tr> </table> -</body></html> EOF + echo $FOOTEN fi fi @@ -69,40 +243,68 @@ fi if [ "$CMD" = "securechmod" ]; then - chmod 700 backup cache counter diff info wiki session user - chmod 700 backup.* cache.* counter.* diff.* info.* wiki.* - chmod 700 lib plugin release resource sample - chmod 701 attach image skin - chmod 701 attach.* skin.* - chmod 700 index.cgi - chmod 700 pyukiwiki.ini.cgi + chmod 700 backup cache counter diff info wiki session user 2>/dev/null + chmod 700 backup.* cache.* counter.* diff.* info.* wiki.* 2>/dev/null + chmod 700 lib plugin release resource sample 2>/dev/null + chmod 701 attach image skin 2>/dev/null + chmod 701 attach.* skin.* 2>/dev/null + chmod 701 index.cgi 2>/dev/null + chmod 700 pyukiwiki.ini.cgi 2>/dev/null fi if [ "$CMD" = "chmod" ]; then - chmod 755 backup cache counter diff info wiki session user - chmod 755 backup.* cache.* counter.* diff.* info.* wiki.* - chmod 755 lib plugin release resource sample - chmod 755 attach image skin - chmod 755 attach.* skin.* - chmod 755 index.cgi - chmod 755 pyukiwiki.ini.cgi + chmod 755 backup cache counter diff info wiki session user 2>/dev/null + chmod 755 backup.* cache.* counter.* diff.* info.* wiki.* 2>/dev/null + chmod 755 lib plugin release resource sample 2>/dev/null + chmod 755 attach image skin 2>/dev/null + chmod 755 attach.* skin.* 2>/dev/null + chmod 755 index.cgi 2>/dev/null + chmod 755 pyukiwiki.ini.cgi 2>/dev/null fi if [ "$CMD" = "extract" ]; then - echo extract cmd + cp $I $I.$TXTEXT + rm $I + $TXTCMD -o $I.$ARCEXT $I.$TXTEXT + $ARCCMD $I.$ARCEXT + $TARCMD $TAROPT $I >/dev/null 2>/dev/null + if [ "$CODE" = "UTF-8" ]; then + P="pyukiwiki-$VER$BUILD-utf8" + else + P="pyukiwiki-$VER$BUILD" + fi + cp -pR $P/* . >/dev/null 2>/dev/null + cp -pR $P/.ht* . >/dev/null 2>/dev/null + cp -pR $P/attach/.ht* $P/attach >/dev/null 2>/dev/null + cp -pR $P/build/.ht* $P/build >/dev/null 2>/dev/null + cp -pR $P/cache/.ht* $P/cache >/dev/null 2>/dev/null + cp -pR $P/counter/.ht* $P/counter >/dev/null 2>/dev/null + cp -pR $P/diff/.ht* $P/diff >/dev/null 2>/dev/null + cp -pR $P/image/.ht* $P/image >/dev/null 2>/dev/null + cp -pR $P/info/.ht* $P/info >/dev/null 2>/dev/null + cp -pR $P/lib/.ht* $P/lib >/dev/null 2>/dev/null + cp -pR $P/logs/.ht* $P/logs >/dev/null 2>/dev/null + cp -pR $P/plugin/.ht* $P/plugin >/dev/null 2>/dev/null + cp -pR $P/releasepatch/.ht* $P/releasepatch >/dev/null 2>/dev/null + cp -pR $P/resource/.ht* $P/resource >/dev/null 2>/dev/null + cp -pR $P/sample/.ht* $P/sample >/dev/null 2>/dev/null + cp -pR $P/skin/.ht* $P/skin >/dev/null 2>/dev/null + cp -pR $P/wiki/.ht* $P/wiki >/dev/null 2>/dev/null + rm -rf $P fi if [ "$CMD" = "cgiinstall" ]; then - $SH $S extract $MYCMD - $SH $S setperl $MYCMD + $SH $X extract $MYCMD + $SH $X setperl $MYCMD if [ "`echo $QUERY_STRING|grep secureinstall`" != "" ] ; then - $SH $S securechmod $MYCMD + $SH $X securechmod $MYCMD else - $SH $S chmod $MYCMD + $SH $X chmod $MYCMD fi if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then + echo $DOCTYPE + echo $HEADJA cat <<EOF -$head_ja <body><h2>PyukiWikiインストーラ</h2> <table> <tr><td colspan="2"> @@ -113,11 +315,12 @@ <a href="index.cgi">動作確èªã¯ã“ã¡ã‚‰ã‹ã‚‰</a> </td></tr> </table> -</body></html> EOF + echo $FOOTJA else + echo $DOCTYPE + echo $HEADEN cat <<EOF -$head_en <body><h2>PyukiWiki Installer</h2> <table> <tr><td colspan="2"> @@ -130,24 +333,26 @@ </table> </body></html> EOF + echo $FOOTEN fi fi if [ "$CMD" = "shell" ]; then + updatecheck echo Install PyukiWiki - echo "$VER$BUILD ($CODE)" + echo "Version:$VER$BUILD ($CODE)" echo Install to $PWD echo -n "Secure install ? (y/n) : " read secure echo -n "Press any key to install (Stop:Ctrl+C) : " read ans - $SH $S extract $MYCMD - $SH $S setperl $MYCMD + $SH $X extract $MYCMD + $SH $X setperl $MYCMD if [ "`echo $secure|grep '[Yy]'`" != "" ]; then - $SH $S securechmod $MYCMD + $SH $X securechmod $MYCMD else - $SH $S chmod $MYCMD + $SH $X chmod $MYCMD fi echo "Install complete." fi Index: PyukiWiki-Devel-UTF8/build/makeinstaller.sh diff -u PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.1 PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.2 --- PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.1 Sat Jan 28 01:11:29 2012 +++ PyukiWiki-Devel-UTF8/build/makeinstaller.sh Sat Jan 28 23:22:12 2012 @@ -34,7 +34,10 @@ EXTCMD="unxz" fi # echo cp ./build/installer_sub.sh $TEMP1 - cp ./build/installer_sub.sh $TEMP1 >/dev/null 2>/dev/null + cd build + tar cvf $TEMP1 installer_sub.sh *.html >/dev/null 2>/dev/null + cd .. +# cp ./build/installer_sub.sh $TEMP1 >/dev/null 2>/dev/null # echo $ARCCMD $TEMP1.$ARCMETHOD $TEMP1 $ARCCMD $TEMP1.$ARCMETHOD $TEMP1 >/dev/null 2>/dev/null @@ -75,24 +78,28 @@ | sed -e "s/__BUILD__/$PREFIX/g" \ | sed -e "s/__CODE__/$CODE/g"> $TOFILE -echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE +#echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE +echo cat\>\$S\<\<\'aaaaaaaa\'>>$TOFILE cat>$TEMPDIR/tmp.pl<<EOF open(R,"$TEMP2"); foreach(<R>){ -print "X\$_"; +#print "X\$_"; +print "\$_"; } close(R); EOF perl $TEMPDIR/tmp.pl>>$TOFILE echo aaaaaaaa>>$TOFILE -echo sed \'s/^X//\'\>\$I\<\<\'bbbbbbbb\'>>$TOFILE +#echo sed \'s/^X//\'\>\$I\<\<\'bbbbbbbb\'>>$TOFILE +echo cat\>\$I\<\<\'bbbbbbbb\'>>$TOFILE cat>$TMPDIR/tmp.pl<<EOF open(R,"$TEMP3"); foreach(<R>){ -print "X\$_"; +#print "X\$_"; +print "\$_"; } close(R); EOF Index: PyukiWiki-Devel-UTF8/build/text.pl diff -u PyukiWiki-Devel-UTF8/build/text.pl:1.241 PyukiWiki-Devel-UTF8/build/text.pl:1.242 --- PyukiWiki-Devel-UTF8/build/text.pl:1.241 Sat Jan 28 01:39:49 2012 +++ PyukiWiki-Devel-UTF8/build/text.pl Sat Jan 28 23:22:12 2012 @@ -1,5 +1,5 @@ # release file perl script for pyukiwiki -# $Id: text.pl,v 1.241 2012/01/27 16:39:49 papu Exp $ +# $Id: text.pl,v 1.242 2012/01/28 14:22:12 papu Exp $ use Jcode; @@ -336,18 +336,23 @@ $text{YASHIGANIMODOKI_URL}='http://hpcgi1.nifty.com/it2f/wikinger/pyukiwiki.cgi'; $text{SOURCEFORGE_JP_DOMAIN}="sfjp.jp"; $text{SOURCEFORGE_NET_DOMAIN}="sf.net"; -$text{PYUKI_URL}='http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/'; -$text{YUKIWIKI_URL}='http://www.hyuki.com/yukiwiki/'; -$text{PUKIWIKI_URL}='http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/'; -$text{PUKIWIKIDEV_URL}='http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/'; +$text{PYUKI_URL}="http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/"; +$text{YUKIWIKI_URL}="http://www.hyuki.com/yukiwiki/"; +$text{PUKIWIKI_URL}="http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/"; +$text{PUKIWIKIDEV_URL}="http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/"; -$text{AWSTATS_URL}='http://awstats.$text{SOURCEFORGE_NET_DOMAIN}/'; +$text{AWSTATS_URL}="http://awstats.$text{SOURCEFORGE_NET_DOMAIN}/"; -$text{BASEURL}='http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}'; -$text{CVSURL}='http://$text{SOURCEFORGE_JP_DOMAIN}/cvs/view/pyukiwiki'; +$text{BASEURL}="http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}"; +$text{CVSURL}="http://$text{SOURCEFORGE_JP_DOMAIN}/cvs/view/pyukiwiki"; $text{RECENTDATE}=&date("Y-m-d (D)"); +$text{GPLJP_URL}="http://sfjp.jp/projects/opensource/wiki/GPLv3_Info"; +$text{GPL_URL}="http://www.gnu.org/licenses/gpl.html"; +$text{ARTISTICJP_URL}="http://www.opensource.jp/artistic/ja/Artistic-ja.html"; +$text{ARTISTIC_URL}="http://www.perl.com/language/misc/Artistic.html"; + ############################################################# # ($fn,$pyukiversion,$mode)=@_; @@ -355,6 +360,7 @@ $text{FILENAME}=~s/.*\///g; $text{CRLF}=$mode eq 'lf' ? 'LF' : 'CRLF'; $text{PYUKIWIKIVERSION}=qq("PyukiWiki" version $pyukiversion \$\$); + $text{PYUKIVER}=qq($pyukiversion); $VERSION=""; $pkg=""; $PLUGIN="";
