PyukiWiki CVS Commit
pyuki****@lists*****
2012年 2月 28日 (火) 03:14:20 JST
Index: PyukiWiki-Devel-UTF8/build/installer_sub.sh diff -u PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.25 PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.26 --- PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.25 Tue Feb 28 02:49:58 2012 +++ PyukiWiki-Devel-UTF8/build/installer_sub.sh Tue Feb 28 03:14:20 2012 @@ -14,10 +14,26 @@ //--></style> </head> EOM -HEADJA="<html><head><title>PyukiWikiインストーラ</title>" -HEADEN="<html><head><title>PyukiWiki Installer</title>" -BODYJA="<body><h2>PyukiWikiインストーラ</h2>" -BODYEN="<body><h2>PyukiWiki Installer</h2>" +HEAD=`cat headtmp` +if [ "$update" != "" ]; then + NAMEJA="アップデーター" + DOJA="アップデート" + NAMEEN="Updater" + DOEN="Update" + DOZEN=$DOEN + DOZZEN=$DOEN +else + NAMEJA="インストーラー" + DOJA="インストール" + NAMEEN="Installer" + DOEN="Install" + DOZEN="installation" + DOZZEN="Installation" +fi +HEADJA="<html><head><title>PyukiWiki\$NAMEJA</title>" +HEADEN="<html><head><title>PyukiWiki \$NAMEEN</title>" +BODYJA="<body><h2>PyukiWiki\$NAMEJA</h2>" +BODYEN="<body><h2>PyukiWiki \$NAMEEN</h2>" FOOTJA='<hr><div id="footer"><strong><a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki 0.2.0-p2-preview5">PyukiWiki 0.2.0-p2-preview5</a></strong>Copyright© 2004-2012 by <a href="http://nekyo.qp.land.to/" class="link" title="Nekyo">Nekyo</a>, <a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://sfjp.jp/projects/opensource/wiki/GPLv3_Info" class="link" title="GPL">GPL</a>, <a href="http://www.opensource.jp/artistic/ja/Artistic-ja.html" class="link" title="Artistic">Artistic</a><br>Based on "<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>" 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">PukiWiki Developers Term</a><br><a href="http://pyu kiwiki.sfjp.jp/" class="link" title="PyukiWiki Installer version $IVER">PyukiWiki Installer version $IVER</a></div></div></div></body></html>' FOOTEN='<hr><div id="footer"><strong><a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Installer 0.2.0-p2-preview5">PyukiWiki Installer 0.2.0-p2-preview5</a></strong>Copyright© 2004-2012 by <a href="http://nekyo.qp.land.to/" class="link" title="Nekyo">Nekyo</a>, <a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://www.gnu.org/licenses/gpl.html" class="link" title="GPL">GPL</a>, <a href="http://www.perl.com/language/misc/Artistic.html" class="link" title="Artistic">Artistic</a><br>Based on "<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>" 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">PukiWiki Developers Term</a><br><a href="http://pyu kiwiki.sfjp.jp/" class="link" title="PyukiWiki Installer version $IVER">PyukiWiki Installer version $IVER</a></div></div></div></body></html>' @@ -67,12 +83,12 @@ if [ "`echo $LN | grep ja`" != "" ]; then echo $DOCTYPE echo $HEADJA - cat headtmp + echo $HEAD cat <<EOF $BODYJA <table> <tr><td colspan="2"> -PyukiWikiをインストールã—ã¾ã™ã€‚<br> +PyukiWikiã‚’$DOJAã—ã¾ã™ã€‚<br> 「次ã¸ã€ã‚’押ã—ã¦ä¸‹ã•ã„。 <div align="left"> <form action="$SCRIPT_NAME" method="GET"> @@ -87,12 +103,12 @@ else echo $DOCTYPE echo $HEADEN - cat headtmp + echo $HEAD cat <<EOF $BODYEN <table> <tr><td colspan="2"> -Install PyukiWiki.<br> +$DOEN PyukiWiki.<br> Press "Next" <div align="left"> <form action="$SCRIPT_NAME" method="GET"> @@ -111,7 +127,7 @@ if [ "`echo $LN | grep ja`" != "" ]; then echo $DOCTYPE echo $HEADJA - cat headtmp + echo $HEAD cat <<EOF $BODYJA <table> @@ -130,7 +146,7 @@ else echo $DOCTYPE echo $HEADEN - cat headtmp + echo $HEAD cat <<EOF $BODYEN <table> @@ -153,7 +169,7 @@ if [ "`echo $LN | grep ja`" != "" ]; then echo $DOCTYPE echo $HEADJA - cat headtmp + echo $HEAD cat <<EOF $BODYJA <table> @@ -172,7 +188,7 @@ else echo $DOCTYPE echo $HEADEN - cat headtmp + echo $HEAD cat <<EOF $BODYEN <table> @@ -201,20 +217,20 @@ if [ "`echo $LN | grep ja`" != "" ]; then echo $DOCTYPE echo $HEADJA - cat headtmp + echo $HEAD cat <<EOF $BODYJA <table> <tr><td colspan="2"> -PyukiWikiã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®æº–å‚™ã¯å®Œäº†ã—ã¾ã—ãŸã€‚<br> +PyukiWikiã®$DOJAã®æº–å‚™ã¯å®Œäº†ã—ã¾ã—ãŸã€‚<br> 以下ã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ä¸‹ã•ã„。<br> -次ã¸ã‚’クリックã™ã‚‹ã¨ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’開始ã—ã¾ã™ã€‚<br> +次ã¸ã‚’クリックã™ã‚‹ã¨ã€$DOJAを開始ã—ã¾ã™ã€‚<br> <div align="left"> <form action="$SCRIPT_NAME" method="GET"> <table> -<tr><td>インストールモード</td><td> -<input type="radio" name="installmode" value="normal" $chk>通常インストール -<input type="radio" name="installmode" value="secure">ã‚»ã‚ãƒ¥ã‚¢ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ï¼ˆãƒ‘ãƒ¼ãƒŸãƒƒã‚·ãƒ§ãƒ³ã‚’åŽ³æ ¼ã«è¨å®šã—ã¾ã™ã€‚） +<tr><td>$DOJAモード</td><td> +<input type="radio" name="installmode" value="normal" $chk>通常$DOJA +<input type="radio" name="installmode" value="secure">ã‚»ã‚ュア$DOJAï¼ˆãƒ‘ãƒ¼ãƒŸãƒƒã‚·ãƒ§ãƒ³ã‚’åŽ³æ ¼ã«è¨å®šã—ã¾ã™ã€‚） </td></tr> <tr><td>.htaccessファイル</td><td> <input type="radio" name="htaccess" value="htaccesson" $chk>è¨ç½®ã™ã‚‹ @@ -238,9 +254,9 @@ <input type="radio" name="gzip" value="gzipoff">無効 <input type="radio" name="gzip" value="gzipon" $chk>有効 </td></tr> -<tr><td>インストールã™ã‚‹ãƒ‘ス:</td> +<tr><td>$DOJAã™ã‚‹ãƒ‘ス:</td> <td>$PWD</td></tr> -<tr><td>インストールã™ã‚‹PyukiWikiã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³:</td> +<tr><td>$DOJAã™ã‚‹PyukiWikiã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³:</td> <td>$VER$BUILD ($CODE)$UPDATEHTML</td></tr> <tr><td>解å‡ã‚³ãƒžãƒ³ãƒ‰:</td> <td>$TXTCMD $ARCCMD $TARCMD</td></tr> @@ -256,20 +272,20 @@ else echo $DOCTYPE echo $HEADEN - cat headtmp + echo $HEAD cat <<EOF $BODYEN <table> <tr><td colspan="2"> -Complete of preparing for the installation of PyukiWiki<br> +Complete of preparing for the $DOZEN of PyukiWiki<br> Please select the options.<br> -Press Next, installation complete. +Press Next, $DOZEN complete. <div align="left"> <form action="$SCRIPT_NAME" method="GET"> <table> -<tr><td>Install Mode</td><td> -<input type="radio" name="installmode" value="normal" $chk>Default Install -<input type="radio" name="installmode" value="secure">Secure Install (Setting strict file and permissions.) +<tr><td>$DOEN Mode</td><td> +<input type="radio" name="installmode" value="normal" $chk>Default $DOEN +<input type="radio" name="installmode" value="secure">Secure $DOEN (Setting strict file and permissions.) </td></tr> <tr><td>.htaccess File</td><td> <input type="radio" name="htaccess" value="htaccesson" $chk>Install @@ -379,9 +395,9 @@ if [ "`echo $QS|grep secure`" != "" ] ; then $SH $X securechmod $MYCMD if [ "`echo $LN | grep ja`" != "" ]; then - INSTALLMODE="ã‚»ã‚ュアインストールモードã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ã—ã¾ã—ãŸã€‚<br>" + INSTALLMODE="ã‚»ã‚ュア$DOJAモードã§$DOJAã‚’ã—ã¾ã—ãŸã€‚<br>" else - INSTALLMODE="Installation complete in secure mode.<br>" + INSTALLMODE="$DOZZEN complete in secure mode.<br>" fi else $SH $X chmod $MYCMD @@ -433,22 +449,22 @@ if [ "`echo $LN | grep ja`" != "" ]; then echo $DOCTYPE echo $HEADJA - cat headtmp + echo $HEAD cat <<EOF $BODYJA <table> <tr><td colspan="2"> -PyukiWikiã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ã¾ã—ãŸã€‚<br> +PyukiWikiã®$DOJAãŒå®Œäº†ã—ã¾ã—ãŸã€‚<br> $INSTALLMODE$HTACCESS$FREEZE$GZIP -インストーラã¯ã€å‹•ä½œã‚’確èªã—ãŸå¾Œã€ä¸æ£ã‚¢ã‚¯ã‚»ã‚¹é˜²æ¢ã®ç‚ºã«ã€å¿…ãšå‰Šé™¤ã—ã¦ä¸‹ã•ã„。<br> +$NAMEJAã¯ã€å‹•ä½œã‚’確èªã—ãŸå¾Œã€ä¸æ£ã‚¢ã‚¯ã‚»ã‚¹é˜²æ¢ã®ç‚ºã«ã€å¿…ãšå‰Šé™¤ã—ã¦ä¸‹ã•ã„。<br> åˆå›žèµ·å‹•æ™‚ã®ç®¡ç†è€…パスワードã¯ã€Œpassã€ã§ã™ã€‚<br> <br> -動作ã—ãªã„時ã¯ã€æˆ»ã‚‹ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã‹ã‚‰ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚ªãƒ—ションを変更ã™ã‚‹ã¨å‹•ä½œã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ +動作ã—ãªã„時ã¯ã€æˆ»ã‚‹ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã‹ã‚‰ã€$DOJAオプションを変更ã™ã‚‹ã¨å‹•ä½œã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ <br><br> <font soze="+1"><a href="index.cgi">動作確èªã¯ã“ã¡ã‚‰ã‹ã‚‰</a></font> <div align="left"> <form action="index.cgi" method="GET"> -<input type="submit" value="戻る" $buttonstyle> +<input type="submit" value="戻る" $buttonstyle $disable> <input type="submit" value="次ã¸" $buttonstyle $disable> <input type="submit" name="complete" value="完了" $buttonstyle> </form></div> @@ -459,22 +475,22 @@ else echo $DOCTYPE echo $HEADEN - cat headtmp + echo $HEAD cat <<EOF $BODYEN <table> <tr><td colspan="2"> -Install Complete<br> +$DOEN Complete<br> $INSTALLMODE$HTACCESS$GZIP -Must remove installer file, after that it works, to prevent unauthorized access.<br> +Must remove $NAMEEN file, after that it works, to prevent unauthorized access.<br> Initial administrator password is "pass".<br> <br> -When this does not work, press the back button, you may work with to change the installation options. +When this does not work, press the back button, you may work with to change the $DOEN options. <br><br> <font size="+1"><a href="index.cgi">Test Pyukiwiki Hear</a></font> <div align="left"> <form action="index.cgi" method="GET"> -<input type="submit" value="Back" $buttonstyle> +<input type="submit" value="Back" $buttonstyle $disable> <input type="submit" value="Next" $buttonstyle $disable> <input type="submit" name="complete" value="Complete" $buttonstyle> </form></div> @@ -488,12 +504,12 @@ if [ "$CMD" = "shell" ]; then updatecheck - echo Install PyukiWiki + echo $DOEN PyukiWiki echo "Version:$VER$BUILD ($CODE)" - echo Install to $PWD - echo -n "Secure install ? (y/n) : " + echo $DOEN to $PWD + echo -n "Secure $DOEN ? (y/n) : " read secure - echo -n "Press any key to install (Stop:Ctrl+C) : " + echo -n "Press any key to $DOEN (Stop:Ctrl+C) : " read ans $SH $X extract $MYCMD @@ -503,7 +519,7 @@ else $SH $X chmod $MYCMD fi - echo "Install complete." + echo "$DOEN complete." fi rm headtmp
