shenshihai 2 rokov pred
rodič
commit
e5f5edd9d8
2 zmenil súbory, kde vykonal 5 pridanie a 3 odobranie
  1. 3 3
      src/PackageClass.php
  2. 2 0
      src/Utility.php

+ 3 - 3
src/PackageClass.php

@@ -405,9 +405,9 @@ class PackageClass
 		$appdataDir = pathJoin($rootDirUp2,'appdata');
 		$tmpdataDir = pathJoin($rootDirUp2,'tmpdata');
 		$macros = array(
-			'{sis31.appdir}' => str_replace('\\','/',$rootDir),
-			'{sis31.appdata}' => str_replace('\\','/',$appdataDir),
-			'{sis31.tmpdata}' => str_replace('\\','/',$tmpdataDir),
+			'{sis31.appdir}' => $rootDir,
+			'{sis31.appdata}' => $appdataDir,
+			'{sis31.tmpdata}' => $tmpdataDir,
 		);
 		foreach($macroFiles as $fileInfo){
 			$fileName = $fileInfo['path'];

+ 2 - 0
src/Utility.php

@@ -75,6 +75,8 @@ function get7ZipPath($toolDir){
 }
 //两个参数的路径拼接
 function twoPathJoin($base, $path) {
+	$base = str_replace('\\','/',$base);
+	$path = str_replace('\\','/',$path);
 	return rtrim( $base, '/' ) . '/' . ltrim( $path, '/' );
 }