PyukiWiki

[Pyukiwiki-cvs 0004055] CVS update: PyukiWiki-Devel/build

PyukiWiki CVS Commit pyuki****@lists*****
2012年 1月 29日 (日) 05:01:28 JST

• 前の記事 [Pyukiwiki-cvs 0004052] CVS update: DevelopmentEnvironment
• 次の記事 [Pyukiwiki-cvs 0004056] CVS update: PyukiWiki-Devel/lib
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: PyukiWiki-Devel/build/build.mk
diff -u PyukiWiki-Devel/build/build.mk:1.427 PyukiWiki-Devel/build/build.mk:1.428
--- PyukiWiki-Devel/build/build.mk:1.427	Sat Jan 28 23:25:09 2012
+++ PyukiWiki-Devel/build/build.mk	Sun Jan 29 05:01:28 2012
@@ -1,5 +1,5 @@
 # release file makefile for pyukiwiki
-# $Id: build.mk,v 1.427 2012/01/28 14:25:09 papu Exp $
+# $Id: build.mk,v 1.428 2012/01/28 20:01:28 papu Exp $
 
 all:
 	@echo "PyukiWIki ${VERSION} Release Builder"
@@ -105,9 +105,10 @@
 	@rm ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.bz2
 	@rm ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.xz
 	@echo "Make installer ${PKGNAME}-${VERSION}${PKGPREFIX}"
-	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_gz_uu ${VERSION} ${PKGPREFIX} gz uu EUC
-	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_bz2_b64 ${VERSION} ${PKGPREFIX} bz2 b64 EUC
-	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_xz_b64 ${VERSION} ${PKGPREFIX} xz b64 EUC
+	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer ${VERSION} ${PKGPREFIX} gz shar EUC
+#	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_gz_uu ${VERSION} ${PKGPREFIX} gz uu EUC
+#	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_bz2_b64 ${VERSION} ${PKGPREFIX} bz2 b64 EUC
+#	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_xz_b64 ${VERSION} ${PKGPREFIX} xz b64 EUC
 
 pkgzip:
 	@echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}"
@@ -138,9 +139,10 @@
 
 	@echo "Taping ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar"
 	@echo "Make installer ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8"
-	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_gz_uu ${VERSION} ${PKGPREFIX} gz uu UTF-8
-	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_bz2_b64 ${VERSION} ${PKGPREFIX} bz2 b64 UTF-8
-	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_xz_b64 ${VERSION} ${PKGPREFIX} xz b64 UTF-8
+	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer ${VERSION} ${PKGPREFIX} gz shar UTF-8
+#	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_gz_uu ${VERSION} ${PKGPREFIX} gz uu UTF-8
+#	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_bz2_b64 ${VERSION} ${PKGPREFIX} bz2 b64 UTF-8
+#	@${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_xz_b64 ${VERSION} ${PKGPREFIX} xz b64 UTF-8
 
 
 
Index: PyukiWiki-Devel/build/installer.sh
diff -u PyukiWiki-Devel/build/installer.sh:1.5 PyukiWiki-Devel/build/installer.sh:1.6
--- PyukiWiki-Devel/build/installer.sh:1.5	Sat Jan 28 23:22:10 2012
+++ PyukiWiki-Devel/build/installer.sh	Sun Jan 29 05:01:28 2012
@@ -18,7 +18,7 @@
 export S=".installertarball"
 export I=".installimagetarball"
 export httpheader="Content-type: text/html;charset=utf-8"
-
+export TMPPL="/tmp/tmp.$REMOTE_ADDR"
 
 err() {
 	if [ $CGI = 1 ]; then
@@ -68,10 +68,13 @@
 	else
 		err "It is not running on the user rights CGI, you can not install"
 	fi
-return 1;
+	return 1;
 }
 
 cmdc() {
+	if [ "$1" = "" ]; then
+		return 0;
+	fi
 	CMD=`which $1`
 	if [ "$CMD" != "" ]; then
 		return 0;
@@ -113,9 +116,7 @@
 
 EOF
 	chk
-	if [ "$QUERY_STRING" = "" ]; then
-		SHELLEXEC=cgistart
-	fi
+	SHELLEXEC=cgistart
 	if [ "`echo $QUERY_STRING|grep license`" != "" ]; then
 		SHELLEXEC=license
 	fi
@@ -134,4 +135,4 @@
 else
 	chk
 	SHELLEXEC=shell
-fi
+	fi
Index: PyukiWiki-Devel/build/installer2.sh
diff -u PyukiWiki-Devel/build/installer2.sh:1.2 PyukiWiki-Devel/build/installer2.sh:1.3
--- PyukiWiki-Devel/build/installer2.sh:1.2	Sat Jan 28 23:22:10 2012
+++ PyukiWiki-Devel/build/installer2.sh	Sun Jan 29 05:01:28 2012
@@ -1,6 +1,13 @@
+cat <<EOF|perl -e 'while(<STDIN>){$z.=$_;}foreach my $i(0x00 .. 0xFF){$x{sprintf("%02X",$i)}=chr($i);}$z=~s/([0-9A-F][0-9A-F])/$x{$1}/g;print $z;'>$TMPPL
+7768696C65283C535444494E3E297B24692E3D245F3B7D7072696E7420266264282469293B7375622062647B6D7928245F293D405F3B6D792024723B24613D274142434445464748494A4B4C4D4E4F505152535455565758595A6162636465666768696A6B6C6D6E6F707172737475767778797A303132333435363738392B2F273B24623D717C602122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F7C2E27404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5C5D5E5F273B2824633D2220222E2462293D7E732F5C5C2F5C5C5C5C2F3B24643D2241222E24613B6576616C2071717B74727C24647C7C63643B74727C24647C24637C3B7D3B7768696C6528732F5E282E7B36307D292F2F297B24722E3D756E7061636B282275222C224D222E2426293B7D696628245F206E65202222297B24722E3D756E7061636B282275222C7375627374722824622C6C656E67746828245F292A332F342C31292E245F293B7D24723B7D
+EOF
 cp $S $S.$TXTEXT >/dev/null 2>/dev/null
 rm -f $S
-$TXTCMD -o $S.$ARCEXT $S.$TXTEXT >/dev/null 2>/dev/null
+if [ "$TXTCMD" = "" ]; then
+	perl $TMPPL < $S.$TXTEXT > $S.$ARCEXT
+else
+	$TXTCMD -o $S.$ARCEXT $S.$TXTEXT >/dev/null 2>/dev/null
+fi
 $ARCCMD $S.$ARCEXT >/dev/null 2>/dev/null
 $TARCMD $TAROPT $S >/dev/null 2>/dev/null
 if [ -f $S ]; then
@@ -8,4 +15,4 @@
 		$SH $X $SHELLEXEC $0
 	fi
 fi
-rm -f $X *.html $S $S.$TXTEXT $S.$ARCEXT $I $I.$TXTEXT $I.$ARCEXT
+rm -f $X *.html $S $S.$TXTEXT $S.$ARCEXT $I $I.$TXTEXT $I.$ARCEXT $TMPPL
Index: PyukiWiki-Devel/build/installer_sub.sh
diff -u PyukiWiki-Devel/build/installer_sub.sh:1.2 PyukiWiki-Devel/build/installer_sub.sh:1.3
--- PyukiWiki-Devel/build/installer_sub.sh:1.2	Sat Jan 28 23:22:10 2012
+++ PyukiWiki-Devel/build/installer_sub.sh	Sun Jan 29 05:01:28 2012
@@ -1,17 +1,12 @@
 #!/bin/sh
-
-
 CMD=$1
 MYCMD=$2
-
+disable='disabled="disabled"'
+buttonstyle='style="width:150px;"'
 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&copy; 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 &quot;<a href="\@\@YUKIWIKI_URL\@\@" class="link" title="YukiWiki">YukiWiki</a>&quot; 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&copy; 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 &quot;<a href="\@\@YUKIWIKI_URL\@\@" class="link" title="YukiWiki">YukiWiki</a>&quot; 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() {
@@ -68,7 +63,9 @@
 「次へ」を押して下さい。
 <div align="left">
 <form action="$SCRIPT_NAME" method="GET">
-<input type="submit" name="step1" value="次へ">
+<input type="submit" name="dummy" value="戻る" $buttonstyle $disable>
+<input type="submit" name="step1" value="次へ" $buttonstyle>
+<input type="submit" name="cancel" value="キャンセル" $buttonstyle $disable>
 </form></div>
 </td></tr>
 </table>
@@ -84,8 +81,10 @@
 Install PyukiWiki.<br>
 Press "Next"
 <div align="left">
-<form action="$0" method="GET">
-<input type="submit" name="step1" value="Next">
+<form action="$SCRIPT_NAME" method="GET">
+<input type="submit" name="dummy" value="Back" $buttonstyle $disable>
+<input type="submit" name="step1" value="Next" $buttonstyle>
+<input type="submit" name="cancel" value="Cancel" $buttonstyle $disable>
 </form></div>
 </td></tr>
 </table>
@@ -105,8 +104,9 @@
 <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="同意する">
+<input type="submit" name="dummy" value="戻る" $buttonstyle>
+<input type="submit" name="step2" value="同意する" $buttonstyle>
+<input type="submit" name="cancel" value="同意しない" $buttonstyle>
 </form></div>
 </td></tr>
 </table>
@@ -122,8 +122,9 @@
 <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">
+<input type="submit" name="dummy" value="Back" $buttonstyle>
+<input type="submit" name="step2" value="Agreement" $buttonstyle>
+<input type="submit" name="cancel" value="Disagree" $buttonstyle>
 </form></div>
 </td></tr>
 </table>
@@ -143,8 +144,9 @@
 <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">
+<input type="submit" name="step1" value="戻る" $buttonstyle>
+<input type="submit" name="step3" value="同意する" $buttonstyle>
+<input type="submit" name="cancel" value="キャンセル" $buttonstyle>
 </form></div>
 </td></tr>
 </table>
@@ -160,8 +162,9 @@
 <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">
+<input type="submit" name="step1" value="Back" $buttonstyle>
+<input type="submit" name="step3" value="Agreement" $buttonstyle>
+<input type="submit" name="cancel" value="Disagree" $buttonstyle>
 </form></div>
 </td></tr>
 </table>
@@ -171,8 +174,6 @@
 fi
 
 if [ "$CMD" = "license" ]; then
-	echo $httpheader
-	echo
 	cat $QUERY_STRING.html
 	exit
 fi
@@ -190,8 +191,9 @@
 インストールをクリックすると、インストールが完了します。
 <div align="left">
 <form action="$SCRIPT_NAME" method="GET">
-<input type="submit" name="install" value="インストール（通常インストール）">
-<input type="submit" name="secureinstall" value="セキュアインストール（パーミッションを厳密に設定する）">
+<input type="submit" name="install" value="通常インストール" $buttonstyle>
+<input type="submit" name="secureinstall" value="セキュアインストール" $buttonstyle>
+<input type="submit" name="cancel" value="キャンセル" $buttonstyle>
 </form></div>
 <hr>
 </td></tr>
@@ -214,9 +216,10 @@
 Complete of preparing for the installation of PyukiWiki<br>
 Press Install, installation complete.
 <div align="left">
-<form action="$0" method="GET">
-<input type="submit" name="install" value="Install">
-<input type="submit" name="secureinstall" value="Secure Install">
+<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>
 </td></tr>
@@ -265,8 +268,12 @@
 if [ "$CMD" = "extract" ]; then
 	cp $I $I.$TXTEXT
 	rm $I
-	$TXTCMD -o $I.$ARCEXT $I.$TXTEXT
-	$ARCCMD $I.$ARCEXT
+	if [ "$TXTCMD" = "" ]; then
+		perl $TMPPL < $I.$TXTEXT > $I.$ARCEXT
+	else
+		$TXTCMD -o $I.$ARCEXT $I.$TXTEXT
+	fi
+	$ARCCMD $I.$ARCEXT >/dev/null  2>/dev/null
 	$TARCMD $TAROPT $I >/dev/null  2>/dev/null
 	if [ "$CODE" = "UTF-8" ]; then
 		P="pyukiwiki-$VER$BUILD-utf8"
@@ -313,6 +320,12 @@
 初回起動時の管理者パスワードは「pass」です。
 <hr>
 <a href="index.cgi">動作確認はこちらから</a>
+<div align="left">
+<form action="index.cgi" method="GET">
+<input type="submit" value="戻る" $buttonstyle $disable>
+<input type="submit" value="次へ" $buttonstyle $disable>
+<input type="submit" name="complete" value="完了" $buttonstyle>
+</form></div>
 </td></tr>
 </table>
 EOF
@@ -329,6 +342,12 @@
 Initial administrator password is "pass".
 <hr>
 <a href="index.cgi">Test Pyukiwiki Hear</a>
+<div align="left">
+<form action="index.cgi" method="GET">
+<input type="submit" value="Back" $buttonstyle $disable>
+<input type="submit" value="Next" $buttonstyle $disable>
+<input type="submit" name="complete" value="Complete" $buttonstyle>
+</form></div>
 </td></tr>
 </table>
 </body></html>
Index: PyukiWiki-Devel/build/makeinstaller.sh
diff -u PyukiWiki-Devel/build/makeinstaller.sh:1.2 PyukiWiki-Devel/build/makeinstaller.sh:1.3
--- PyukiWiki-Devel/build/makeinstaller.sh:1.2	Sat Jan 28 23:22:10 2012
+++ PyukiWiki-Devel/build/makeinstaller.sh	Sun Jan 29 05:01:28 2012
@@ -1,4 +1,8 @@
 #!/bin/sh
+#--------------------------------------------------------------
+# PyukiWiki Installer CGI Maker
+# $Id: makeinstaller.sh,v 1.3 2012/01/28 20:01:28 papu Exp $
+#--------------------------------------------------------------
 ZIPCMD=$1
 P7ZCMD=$2
 ORGFILE=$3
@@ -49,8 +53,17 @@
 		TXTENCCMD="uuencode"
 		TXTCMD="uudecode"
 	fi
-#	echo $TXTENCCMD -o $TEMP2 $TEMP1.$ARCMETHOD a
-	$TXTENCCMD -o $TEMP2 $TEMP1.$ARCMETHOD a >/dev/null 2>/dev/null
+	if [ "$TXTMETHOD" = "shar" ]; then
+		TXTENCCMD=""
+		TXTCMD=""
+	fi
+
+	if [ "$TXTMETHOD" = "shar" ]; then
+		perl ./build/base64.pl b64encode < $TEMP1.$ARCMETHOD > $TEMP2
+#		cp $TEMP1.$ARCMETHOD $TEMP2
+	else
+		$TXTENCCMD -o $TEMP2 $TEMP1.$ARCMETHOD a >/dev/null 2>/dev/null
+	fi
 }
 
 txt() {
@@ -62,8 +75,17 @@
 		TXTENCCMD="uuencode"
 		TXTCMD="uudecode"
 	fi
-#	echo $TXTENCCMD -o $TEMP3 $ORGFILE a
-	$TXTENCCMD -o $TEMP3 $ORGFILE a >/dev/null 2>/dev/null
+	if [ "$TXTMETHOD" = "shar" ]; then
+		TXTENCCMD=""
+		TXTCMD=""
+	fi
+	if [ "$TXTMETHOD" = "shar" ]; then
+		perl ./build/base64.pl b64encode < $ORGFILE > $TEMP3
+#		cp $ORGFILE $TEMP3
+	else
+		$TXTENCCMD -o $TEMP3 $ORGFILE a >/dev/null 2>/dev/null
+	fi
+
 }
 
 arc
@@ -78,10 +100,16 @@
 	| sed -e "s/__BUILD__/$PREFIX/g" \
 	| sed -e "s/__CODE__/$CODE/g"> $TOFILE
 
-#echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE
-echo cat\>\$S\<\<\'aaaaaaaa\'>>$TOFILE
-
-cat>$TEMPDIR/tmp.pl<<EOF
+if [ "$TXTMETHOD" = "shar" ]; then
+#	echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE
+#	sed 's/^/X/' $TEMP2>>$TOFILE
+	echo cat\>\$S\<\<\'aaaaaaaa\'>>$TOFILE
+	cat $TEMP2>>$TOFILE
+	echo aaaaaaaa>>$TOFILE
+else
+	#echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE
+	echo cat\>\$S\<\<\'aaaaaaaa\'>>$TOFILE
+	cat>$TEMPDIR/tmp.pl<<EOF
 open(R,"$TEMP2");
 foreach(<R>){
 #print "X\$_";
@@ -89,13 +117,34 @@
 }
 close(R);
 EOF
-perl $TEMPDIR/tmp.pl>>$TOFILE
-echo aaaaaaaa>>$TOFILE
-
-#echo sed \'s/^X//\'\>\$I\<\<\'bbbbbbbb\'>>$TOFILE
-echo cat\>\$I\<\<\'bbbbbbbb\'>>$TOFILE
-
-cat>$TMPDIR/tmp.pl<<EOF
+	perl $TEMPDIR/tmp.pl>>$TOFILE
+	echo aaaaaaaa>>$TOFILE
+fi
+
+# hexencode
+#perl -e 'while(<STDIN>){chomp;$z.="$_\r";}foreach my $i (0x00 .. 0xFF) {$x{chr($i)} = sprintf("%02X", $i); }$z =~ s/(.)/$x{$1}/g; print $z;'
+
+# hexdecode
+#perl -e 'while(<STDIN>){$z.=$_;}$i=~s/0D/0A/g;foreach my $i (0x00 .. 0xFF) {$x{sprintf("%02X", $i)}=chr($i);}$z=~s/([0-9A-F][0-9A-F])/$x{$1}/g; print $z;'
+
+#if [ "$TXTMETHOD" = "shar" ]; then
+#	echo cat \<\<EOF\|perl -e \'while\(<STDIN>\){chomp;$z.=$_;}$z=~s/\r/\n/g;print $z;\'\>\$TMPPL >>$TOFILE
+#	perl -e 'while(<STDIN>){chomp;$z.="$_\r";}foreach my $i (0x00 .. 0xFF) {$x{chr($i)} = sprintf("\\%02X", $i); }$z =~ s/(.)/$x{$1}/g; print $z;' < ./build/b64decode.pl >>$TOFILE
+#	echo EOF >>$TOFILE
+#fi
+
+
+if [ "$TXTMETHOD" = "shar" ]; then
+#	echo sed \'s/^X//\'\>\$S\<\<\'bbbbbbbb\'>>$TOFILE
+#	sed 's/^/X/' $TEMP3>>$TOFILE
+	echo cat\>\$I\<\<\'bbbbbbbb\'>>$TOFILE
+	cat $TEMP3>>$TOFILE
+	echo aaaaaaaa>>$TOFILE
+	echo bbbbbbbb>>$TOFILE
+else
+	#echo sed \'s/^X//\'\>\$I\<\<\'bbbbbbbb\'>>$TOFILE
+	echo cat\>\$I\<\<\'bbbbbbbb\'>>$TOFILE
+	cat>$TEMPDIR/tmp.pl<<EOF
 open(R,"$TEMP3");
 foreach(<R>){
 #print "X\$_";
@@ -103,8 +152,9 @@
 }
 close(R);
 EOF
-perl $TMPDIR/tmp.pl>>$TOFILE
-echo bbbbbbbb>>$TOFILE
+	perl $TEMPDIR/tmp.pl>>$TOFILE
+	echo bbbbbbbb>>$TOFILE
+fi
 
 rm $TEMP1.$ARCMETHOD
 rm $TEMP2
@@ -112,7 +162,7 @@
 
 #cat $TEMP2 >> $TOFILE
 #cat $TEMP3 >> $TOFILE
-rm $TMPDIR/tmp.pl
+rm -f $TEMPDIR/tmp.pl
 
 cat ./build/installer2.sh \
 	| sed -e "s/__ARCCMD__/$EXTCMD/g" \

• 前の記事 [Pyukiwiki-cvs 0004052] CVS update: DevelopmentEnvironment
• 次の記事 [Pyukiwiki-cvs 0004056] CVS update: PyukiWiki-Devel/lib
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]