From 2ebd814ed2517148dbdd4f7079c1c32f1bc2d5b3 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 9 Jan 2013 03:06:52 +0000
Subject: [PATCH]  * change setpath for bat and shell.

---
 bin/bat/setpath.bat | 25 ++++++++++++++++++-------
 bin/ztcli.bat       |  2 +-
 bin/ztcli.sh        |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/bin/bat/setpath.bat b/bin/bat/setpath.bat
index 0fe18a0c68..f584f63ba0 100755
--- a/bin/bat/setpath.bat
+++ b/bin/bat/setpath.bat
@@ -1,27 +1,29 @@
 @ECHO OFF
-:LOOP
+:READ
 :: SET /P prompts for input and sets the variable
 :: to whatever the user types
 SET path=
 SET suffix=\php.exe
+SET currentFile=%0
 SET /P path=Input the path PHP:
 ::确定路径是否带有\php.exe
-IF EXIST %path%%suffix% GOTO ItemB
-IF EXIST %path% GOTO ItemA
+IF EXIST %path%%suffix% GOTO ONLYDIR
+IF EXIST %path% GOTO FULLPATH
 ECHO "%path%" is not valid. Please try again.
 ECHO.
-GOTO Loop
-:ItemA
+GOTO READ
+:FULLPATH
 ::路径去除\php.exe
 if /I %path:~-8% == %suffix% set path=%path:~0,-8%
-:ItemB
+:ONLYDIR
 ::完整路径
 set path=%path%%suffix%
 set TMPFILE=%random%.tmp
+set currentFile=%currentFile:~-11%
 for /r %~dp0 %%i in (*.bat) do (
 	if exist %TMPFILE% (del /f/q %TMPFILE%)
 ::排除本文件
-	if not %0=="%%i" (
+	if not %~dp0%currentFile%==%%i (
 		echo Change %%i
 		for /f "tokens=1,2* delims= " %%j in (%%i) do (
 ::修改文件特定的行
@@ -30,5 +32,14 @@ for /r %~dp0 %%i in (*.bat) do (
 		move /y %TMPFILE% "%%i"
 	)
 )
+cd ..\
+echo Change ztcli.bat
+::修改ztcli.bat
+if exist %TMPFILE% (del /f/q %TMPFILE%)
+for /f "tokens=1,2* delims= " %%j in (ztcli.bat) do (
+::修改文件特定的行
+	if exist %%k (if "%%l"=="" (echo %path% %%k>>%TMPFILE%) else (echo %path% %%k %%l>>%TMPFILE%)) else (if "%%k"=="" (echo %%j>>%TMPFILE%)	else if "%%l"=="" (echo %%j %%k>>%TMPFILE%) else (echo %%j %%k %%l>>%TMPFILE%))
+)
+move /y %TMPFILE% "ztcli.bat"
 echo Success!
 pause
diff --git a/bin/ztcli.bat b/bin/ztcli.bat
index 4f0e214dd7..68635d88b4 100644
--- a/bin/ztcli.bat
+++ b/bin/ztcli.bat
@@ -1 +1 @@
-php ..\php\ztcli %*
+php ztcli %*
diff --git a/bin/ztcli.sh b/bin/ztcli.sh
index e3e3e80a8e..cdeb151459 100755
--- a/bin/ztcli.sh
+++ b/bin/ztcli.sh
@@ -1 +1 @@
-php ../php/ztcli $*
+php ztcli $*