Merge pull request #61 from huangdijia/fix

Fix the bug that cannot execute after install swoole-cli
hyperf · Oct 14, 2022 · 5313c2b · 5313c2b
2 parents bed64ab + cf7f81a
commit 5313c2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
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
@@ Expand Up / @@ -13,4 +13,5 @@ vendor/ @@
     *.lock
     box
     .box
-    *.phar
+    *.phar
+    .bashrc