Fix wp-cli support

src/scripts/darwin.sh

@@ -93,7 +93,8 @@ add_tool() {
     composer -q global config process-timeout 0
     add_log "$tick" "$tool" "Added"
   else
-    tool_path=/usr/local/bin/"$tool"
+    tool_path_dir=/usr/local/bin
+    tool_path="$tool_path_dir/$tool"
     if [ ! -e "$tool_path" ]; then
       rm -rf "$tool_path"
     fi
@@ -110,7 +111,7 @@ add_tool() {
         tr -d '\r' < "$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
         sudo chmod a+x "$tool_path"
       elif [ "$tool" = "wp-cli" ]; then
-        sudo cp "$tool_path" /usr/local/bin/wp
+        sudo cp -p "$tool_path" "$tool_path_dir"/wp
       fi
       add_log "$tick" "$tool" "Added"
     else

src/scripts/linux.sh

@@ -150,7 +150,8 @@ update_extension() {
 add_tool() {
   url=$1
   tool=$2
-  tool_path=/usr/local/bin/"$tool"
+  tool_path_dir=/usr/local/bin
+  tool_path="$tool_path_dir/$tool"
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
@@ -166,7 +167,7 @@ add_tool() {
       add_extension mbstring "$apt_install php$version-mbstring" extension >/dev/null 2>&1
       add_extension xml "$apt_install php$version-xml" extension >/dev/null 2>&1
     elif [ "$tool" = "wp-cli" ]; then
-      sudo cp "$tool_path" /usr/local/bin/wp
+      sudo cp -p "$tool_path" "$tool_path_dir"/wp
     fi
     add_log "$tick" "$tool" "Added"
   else

src/scripts/win32.ps1

@@ -124,6 +124,8 @@ Function Add-Tool() {
     (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
   } elseif($tool -eq "composer") {
     composer -q global config process-timeout 0
+  } elseif($tool -eq "wp-cli") {
+    Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
   }
   if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
     Add-Log $tick $tool "Added"

src/tools.ts

@@ -316,14 +316,15 @@ export async function getSymfonyUri(
 export async function getWpCliUrl(version: string): Promise<string> {
   switch (version) {
     case 'latest':
-      return 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar';
+      return 'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true';
     default:
-      return (
-        'https://github.com/wp-cli/wp-cli/releases/download/v' +
-        version +
-        '/wp-cli-' +
-        version +
-        '.phar'
+      return await getUri(
+        'wp-cli',
+        '-' + version + '.phar',
+        version,
+        'wp-cli/wp-cli/releases',
+        'v',
+        'download'
       );
   }
 }
@@ -544,7 +545,7 @@ export async function addTools(
         script += await addArchive('symfony', version, url, os_version);
         break;
       case 'wp-cli':
-        url = await getWpCliUrl(version);
+        url = github + (await getWpCliUrl(version));
         script += await addArchive(tool, version, url, os_version);
         break;
       default: