PyukiWiki CVS Commit
pyuki****@lists*****
2012年 1月 29日 (日) 13:46:22 JST
Index: PyukiWiki-Devel/build/installer_sub.sh
diff -u PyukiWiki-Devel/build/installer_sub.sh:1.6 PyukiWiki-Devel/build/installer_sub.sh:1.7
--- PyukiWiki-Devel/build/installer_sub.sh:1.6 Sun Jan 29 12:21:30 2012
+++ PyukiWiki-Devel/build/installer_sub.sh Sun Jan 29 13:46:22 2012
@@ -188,14 +188,18 @@
<table>
<tr><td colspan="2">
PyukiWikiã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®æº–å‚™ã¯å®Œäº†ã—ã¾ã—ãŸã€‚<br>
-インストールをクリックã™ã‚‹ã¨ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ã¾ã™ã€‚
+以下ã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ä¸‹ã•ã„。<br>
+次ã¸ã‚’クリックã™ã‚‹ã¨ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’開始ã—ã¾ã™ã€‚<br>
<div align="left">
<form action="$SCRIPT_NAME" method="GET">
-<input type="submit" name="install" value="通常インストール" $buttonstyle>
-<input type="submit" name="secureinstall" value="ã‚»ã‚ュアインストール" $buttonstyle>
-<input type="submit" name="cancel" value="ã‚ャンセル" $buttonstyle>
-</form></div>
-<hr>
+<table>
+<tr><td>インストールモード</td><td>
+<input type="radio" name="installmode" value="normal" checked="checked">通常インストール
+<input type="radio" name="installmode" value="secure">ã‚»ã‚ãƒ¥ã‚¢ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ï¼ˆãƒ‘ãƒ¼ãƒŸãƒƒã‚·ãƒ§ãƒ³ã‚’åŽ³æ ¼ã«è¨å®šã—ã¾ã™ã€‚）
+</td></tr>
+<tr><td>gzip圧縮転é€</td><td>
+<input type="radio" name="gzip" value="gzipoff">無効
+<input type="radio" name="gzip" value="gzipon" checked="checked">有効
</td></tr>
<tr><td>インストールã™ã‚‹ãƒ‘ス:</td>
<td>$PWD</td></tr>
@@ -204,24 +208,35 @@
<tr><td>解å‡ã‚³ãƒžãƒ³ãƒ‰:</td>
<td>$TXTCMD $ARCCMD $TARCMD</td></tr>
</table>
+<input type="submit" name="step3" value="戻る" $buttonstyle>
+<input type="submit" name="install" value="次ã¸" $buttonstyle>
+<input type="submit" name="cancel" value="ã‚ャンセル" $buttonstyle>
+</form></div>
+<hr>
+</td></tr>
+</table>
EOF
echo $FOOTJA
else
echo $DOCTYPE
echo $HEADEN
cat <<EOF
-<body><h2>PyukiWiki Installer</h2>
+<body><h2>PyukiWikiインストーラ</h2>
<table>
<tr><td colspan="2">
Complete of preparing for the installation of PyukiWiki<br>
-Press Install, installation complete.
+Please select the options.<br>
+Press Next, installation complete.
<div align="left">
<form action="$SCRIPT_NAME" method="GET">
-<input type="submit" name="install" value="Default Install" $buttonstyle>
-<input type="submit" name="secureinstall" value="Secure Install" $buttonstyle>
-<input type="submit" name="cancel" value="cancel" $buttonstyle>
-</form></div>
-<hr>
+<table>
+<tr><td>Install Modeインストールモード</td><td>
+<input type="radio" name="installmode" value="normal" checked="checked">Default Install
+<input type="radio" name="installmode" value="secure">Secure Install (Setting strict file and permissions.)
+</td></tr>
+<tr><td>gzip compress transfer</td><td>
+<input type="radio" name="gzip" value="gzipoff">Disable
+<input type="radio" name="gzip" value="gzipon" checked="checked">Enable
</td></tr>
<tr><td>Target Path:</td>
<td>$PWD</td></tr>
@@ -230,6 +245,13 @@
<tr><td>Extract comomand:</td>
<td>$TXTCMD $ARCCMD $TARCMD</td></tr>
</table>
+<input type="submit" name="step3" value="Back" $buttonstyle>
+<input type="submit" name="install" value="Next" $buttonstyle>
+<input type="submit" name="cancel" value="Cancel" $buttonstyle>
+</form></div>
+<hr>
+</td></tr>
+</table>
EOF
echo $FOOTEN
fi
@@ -303,10 +325,40 @@
if [ "$CMD" = "cgiinstall" ]; then
$SH $X extract $MYCMD
$SH $X setperl $MYCMD
- if [ "`echo $QUERY_STRING|grep secureinstall`" != "" ] ; then
+ if [ "`echo $QUERY_STRING|grep secure`" != "" ] ; then
$SH $X securechmod $MYCMD
+ if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then
+ INSTALLMODE="ã‚»ã‚ュアインストールモードã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ã—ã¾ã—ãŸã€‚<br>"
+ else
+ INSTALLMODE="Installation complete in secure mode.<br>"
+ fi
else
$SH $X chmod $MYCMD
+ INSTALLMODE=""
+ fi
+ if [ "`echo $QUERY_STRING|grep gzipon`" != "" ] ; then
+ echo '$::gzip_path="";'>>./info/setup.ini.cgi
+ echo '1;'>>./info/setup.ini.cgi
+ if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then
+ GZIP="gzip圧縮転é€ã¯æœ‰åŠ¹ã§ã™<br>"
+ else
+ GZIP="gzip compression transfer is enebled<br>"
+ fi
+ else
+ echo '$::gzip_path="nouse";'>>./info/setup.ini.cgi
+ echo '1;'>>./info/setup.ini.cgi
+ GZIP=""
+ fi
+ if [ "`echo $QUERY_STRING|grep resetpassword`" != "" ] ; then
+ echo '$::adminpass=crypt("pass", "AA");'>>./info/setup.ini.cgi
+ echo '$::adminpass{admin}="";'>>./info/setup.ini.cgi
+ echo '$::adminpass{frozen}="";'>>./info/setup.ini.cgi
+ echo '$::adminpass{attach}="";'>>./info/setup.ini.cgi
+ if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then
+ PASSRESET="管ç†è€…パスワードをリセットã—ã¾ã—ãŸã€‚<br>"
+ else
+ PASSRESET="Reset administrator password.<br>"
+ fi
fi
if [ "`echo $HTTP_ACCEPT_LANGUAGE | grep ja`" != "" ]; then
echo $DOCTYPE
@@ -316,6 +368,8 @@
<table>
<tr><td colspan="2">
PyukiWikiã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ã¾ã—ãŸã€‚<br>
+$INSTALLMODE
+$GZIP
インストーラã¯ã€å‹•ä½œã‚’確èªã—ãŸå¾Œã€ä¸æ£ã‚¢ã‚¯ã‚»ã‚¹é˜²æ¢ã®ç‚ºã«ã€å¿…ãšå‰Šé™¤ã—ã¦ä¸‹ã•ã„。<br>
åˆå›žèµ·å‹•æ™‚ã®ç®¡ç†è€…パスワードã¯ã€Œpassã€ã§ã™ã€‚
<hr>
@@ -338,6 +392,8 @@
<table>
<tr><td colspan="2">
Install Complete<br>
+$INSTALLMODE
+$GZIP
Must remove installer file, after that it works, to prevent unauthorized access.<br>
Initial administrator password is "pass".
<hr>