Merge pull request #61 from huangdijia/fix

huangzhhui · web-flow · commit 5313c2b6d717 · 2022-10-14T22:02:09.000+08:00
Fix the bug that cannot execute after install swoole-cli
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ vendor/
 *.lock
 box
 .box
-*.phar
+*.phar
+.bashrc
diff --git a/src/app/DownloadHandler/PintHandler.php b/src/app/DownloadHandler/PintHandler.php
@@ -42,7 +42,7 @@ public function handle(string $pkgName, string $version, array $options = []): ?
             throw new \RuntimeException('The definition of package is invalid');
         }
 
-        $savePath = Phar::running(false) ?: $this->runtimePath . DIRECTORY_SEPARATOR;
+        $savePath = $this->runtimePath . DIRECTORY_SEPARATOR;
         $file = $this->download($url, $savePath, 0755);
         if (! file_exists($savePath)) {
             throw new \RuntimeException('Download failed, cannot locate the file in local.');
diff --git a/src/app/DownloadHandler/SwooleCliHandler.php b/src/app/DownloadHandler/SwooleCliHandler.php
@@ -47,7 +47,7 @@ public function handle(string $pkgName, string $version, array $options = []): ?
             $assetName = $this->replaces($matchRule, ['version' => $specifiedVersion]);
         }
         $url = $this->fetchDownloadUrlFromGithubRelease($assetName, $definition->getRepo(), $specifiedVersion);
-        $savePath = Phar::running(false) ?: $this->runtimePath . DIRECTORY_SEPARATOR;
+        $savePath = $this->runtimePath . DIRECTORY_SEPARATOR;
 
         $file = $this->download($url, $savePath, 0755);
         if (! file_exists($savePath)) {

-Original file line number
+Diff line change
 *.lock
 box
 .box
 -*.phar
 +*.phar
 +.bashrc
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function handle(string $pkgName, string $version, array $options = []): ?`
`42`	`42`	`throw new \RuntimeException('The definition of package is invalid');`
`43`	`43`	`}`
`44`	`44`
`45`		`- $savePath = Phar::running(false) ?: $this->runtimePath . DIRECTORY_SEPARATOR;`
	`45`	`+ $savePath = $this->runtimePath . DIRECTORY_SEPARATOR;`
`46`	`46`	`$file = $this->download($url, $savePath, 0755);`
`47`	`47`	`if (! file_exists($savePath)) {`
`48`	`48`	`throw new \RuntimeException('Download failed, cannot locate the file in local.');`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function handle(string $pkgName, string $version, array $options = []): ?`
`47`	`47`	`$assetName = $this->replaces($matchRule, ['version' => $specifiedVersion]);`
`48`	`48`	`}`
`49`	`49`	`$url = $this->fetchDownloadUrlFromGithubRelease($assetName, $definition->getRepo(), $specifiedVersion);`
`50`		`- $savePath = Phar::running(false) ?: $this->runtimePath . DIRECTORY_SEPARATOR;`
	`50`	`+ $savePath = $this->runtimePath . DIRECTORY_SEPARATOR;`
`51`	`51`
`52`	`52`	`$file = $this->download($url, $savePath, 0755);`
`53`	`53`	`if (! file_exists($savePath)) {`