Add support for cs2pr and refactor tools code

src/scripts/darwin.sh

@@ -87,22 +87,27 @@ add_tool() {
     composer -q global config process-timeout 0
     add_log "$tick" "$tool" "Added"
   else
-    if [ ! -e /usr/local/bin/"$tool" ]; then
-      rm -rf /usr/local/bin/"${tool:?}"
+    tool_path=/usr/local/bin/"$tool"
+    if [ ! -e "$tool_path" ]; then
+      rm -rf "$tool_path"
     fi
-    status_code=$(sudo curl -s -w "%{http_code}" -o /usr/local/bin/"$tool" -L "$url")
+
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
     if [ "$status_code" = "200" ]; then
-      sudo chmod a+x /usr/local/bin/"$tool"
+      sudo chmod a+x "$tool_path"
+      if [ "$tool" = "phive" ]; then
+        add_extension curl >/dev/null 2>&1
+        add_extension mbstring >/dev/null 2>&1
+        add_extension xml >/dev/null 2>&1
+      elif [ "$tool" = "cs2pr" ]; then
+        sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
+        tr -d '\r' < "$tool_path" | sudo tee "$tool_path" >/dev/null 2>&1
+      fi
       add_log "$tick" "$tool" "Added"
     else
       add_log "$cross" "$tool" "Could not setup $tool"
     fi
   fi
-  if [ "$tool" = "phive" ]; then
-    add_extension curl >/dev/null 2>&1
-    add_extension mbstring >/dev/null 2>&1
-    add_extension xml >/dev/null 2>&1
-  fi
 }
 
 # Function to add a tool using composer

src/scripts/linux.sh

@@ -140,14 +140,17 @@ update_extension() {
 add_tool() {
   url=$1
   tool=$2
-  if [ ! -e /usr/local/bin/"$tool" ]; then
-    rm -rf /usr/local/bin/"${tool:?}"
+  tool_path=/usr/local/bin/"$tool"
+  if [ ! -e "$tool_path" ]; then
+    rm -rf "$tool_path"
   fi
-  status_code=$(sudo curl -s -w "%{http_code}" -o /usr/local/bin/"$tool" -L "$url")
+  status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
   if [ "$status_code" = "200" ]; then
-    sudo chmod a+x /usr/local/bin/"$tool"
+    sudo chmod a+x "$tool_path"
     if [ "$tool" = "composer" ]; then
       composer -q global config process-timeout 0
+    elif [ "$tool" = "cs2pr" ]; then
+      sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
     elif [ "$tool" = "phive" ]; then
       add_extension curl >/dev/null 2>&1
       add_extension mbstring >/dev/null 2>&1

src/scripts/win32.ps1

@@ -114,6 +114,9 @@ Function Add-Tool() {
     Add-Extension mbstring >$null 2>&1
     Add-Extension xml >$null 2>&1
   }
+  if($tool -eq "cs2pr") {
+    (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
+  }
   if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
     Add-Log $tick $tool "Added"
   } else {

src/tools.ts

@@ -116,6 +116,7 @@ export async function parseTool(
  */
 export async function getUri(
   tool: string,
+  extension: string,
   version: string,
   prefix: string,
   version_prefix: string,
@@ -123,9 +124,11 @@ export async function getUri(
 ): Promise<string> {
   switch (version) {
     case 'latest':
-      return [prefix, version, verb, tool + '.phar'].filter(Boolean).join('/');
+      return [prefix, version, verb, tool + extension]
+        .filter(Boolean)
+        .join('/');
     default:
-      return [prefix, verb, version_prefix + version, tool + '.phar']
+      return [prefix, verb, version_prefix + version, tool + extension]
         .filter(Boolean)
         .join('/');
   }
@@ -404,12 +407,24 @@ export async function addTools(
     const tool: string = tool_data.name;
     const version: string = tool_data.version;
     const github = 'https://github.com/';
-    let uri: string = await getUri(tool, version, 'releases', '', 'download');
+    let uri: string = await getUri(
+      tool,
+      '.phar',
+      version,
+      'releases',
+      '',
+      'download'
+    );
     script += '\n';
     let url = '';
     switch (tool) {
+      case 'cs2pr':
+        uri = await getUri(tool, '', version, 'releases', '', 'download');
+        url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
       case 'php-cs-fixer':
-        uri = await getUri(tool, version, 'releases', 'v', 'download');
+        uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
         url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
         script += await addArchive(tool, version, url, os_version);
         break;