JBDS-3862 Platform installer failed to detect Cygwin install with ssh and sftp

Fix adds detection for cygwin, openssh and rsync packages

Author: dgolovin

browser/model/cygwin.js

@@ -10,6 +10,7 @@ import Downloader from './helpers/downloader';
 import Logger from '../services/logger';
 import Installer from './helpers/installer';
 import VirtualBoxInstall from './virtualbox';
+import Util from './helpers/util';
 
 
 class CygwinInstall extends InstallableItem {
@@ -28,11 +29,32 @@ class CygwinInstall extends InstallableItem {
     this.addOption('install',this.version,'',true);
   }
 
+  isSkipped() {
+    let t = this.selectedOption === 'detected';
+    return t;
+  }
+
   static key() {
     return 'cygwin';
   }
 
-  checkForExistingInstall() {
+  detectExistingInstall(cb = new function(){}) {
+    let cygwinPackageRegex = /cygwin\s*(\d+\.\d+\.\d+)/,
+        opensshPackageReqex = /openssh\s*(\d+\.\d+)/,
+        rsyncPackageRegex = /rsync\s*(\d+\.\d+\.\d+)/;
+      Util.executeCommand('cygcheck -c cygwin openssh rsync').then((out)=>{
+        let cygwinVersion = cygwinPackageRegex.exec(out)[1];
+        let opensshVersion = opensshPackageReqex.exec(out)[1];
+        let rsyncVersion = rsyncPackageRegex.exec(out)[1];
+        this.addOption('detected','','',true);
+        this.option['detected'].version = cygwinVersion;
+        this.selectedOption = 'detected';
+        cb();
+      }).catch((error)=>{
+        this.addOption('install',this.version,path.join(this.installerDataSvc.installRoot,'cygwin'),true);
+        this.addOption('different','','',false);
+        cb(error);
+      });
   }
 
   downloadInstaller(progress, success, failure) {

browser/pages/confirm/confirm.html

@@ -124,18 +124,20 @@
     </div>
 
     <!-- Cygwin -->
-    <div id="cygwin-panel" class="panel panel-default panel2pxborder" ng-class="{'zero-border':checkboxModel.cygwin.hasOption('detected')}">
+    <div id="cygwin-panel" class="panel panel-default panel2pxborder" ng-class="{'zero-border': checkboxModel.cygwin.hasOption('detected') && checkboxModel.cygwin.selectedOption === 'detected'}">
       <div class="panel-heading panel-normal"
-           ng-class="{'dotted-panel':checkboxModel.cygwin.hasOption('detected')}">
+           ng-class="{'dotted-panel':checkboxModel.cygwin.hasOption('detected') && checkboxModel.cygwin.selectedOption === 'detected'}">
            <!--ng-click="checkboxModel.cygwin.changeIsCollapsed()">-->
-           <div class="checkbox-container verticalLine" ng-show="!checkboxModel.cygwin.hasOption('detected')">
-             <input type="checkbox" ng-disabled="checkboxModel.cdk.selectedOption == 'install'" ng-model="checkboxModel.cygwin.selectedOption" aria-label="Toggle ngHide" class="vallign-middle" ng-true-value="'install'" ng-false-value="'detected'">
+           <div class="checkbox-container verticalLine">
+             <input type="checkbox" ng-disabled="!checkboxModel.cygwin.hasOption('detected') && checkboxModel.cdk.selectedOption == 'install'" ng-model="checkboxModel.cygwin.selectedOption" aria-label="Toggle ngHide" class="vallign-middle" ng-true-value="'install'" ng-false-value="'detected'">
            </div>
         <div class="checkbox-container" ng-show="false">
           <div id="arrow-cygwin" class="arrow" ng-class="{'arrow-down':!checkboxModel.cygwin.isCollapsed}" aria-label="Toggle ngHide"></div>
         </div>
         <div class="product-container">
-          <span class="installed-note" ng-show="checkboxModel.cygwin.hasOption('detected')"><i class="fa fa-check"></i> Existing installation found</span>
+          <span id="cygwin-installed-note" class="installed-note" ng-show="checkboxModel.cygwin.hasOption('detected') && checkboxModel.cygwin.selectedOption === 'detected'">
+            <i class="fa fa-check"></i> Using detected version {{checkboxModel.cygwin.option['detected'].version}}
+          </span>
           <span id="cygwin-name" class="product-name">{{checkboxModel.cygwin.productName}}</span><span id="cygwin-version" class="product-version">{{checkboxModel.cygwin.version}}</span>
           <div id="cygwin-description">{{checkboxModel.cygwin.productDesc}}</div>
         </div>

browser/pages/confirm/controller.js

@@ -49,7 +49,7 @@ class ConfirmController {
       return $scope.checkboxModel.cdk.selectedOption;
     },(nVal,oVal)=>{
       if(nVal=='install') {
-        $scope.checkboxModel.cygwin.selectedOption = 'install';
+
         if($scope.checkboxModel.vagrant.selectedOption == 'detected'
           && !$scope.checkboxModel.vagrant.hasOption('detected')) {
           $scope.checkboxModel.vagrant.selectedOption = 'install';
@@ -58,6 +58,11 @@ class ConfirmController {
           && !$scope.checkboxModel.virtualbox.hasOption('detected')) {
           $scope.checkboxModel.virtualbox.selectedOption = 'install';
         }
+        if($scope.checkboxModel.cygwin.selectedOption == 'detected'
+          && !$scope.checkboxModel.cygwin.hasOption('detected')) {
+          // force to install included version
+          $scope.checkboxModel.cygwin.selectedOption = 'install';
+        }
       }
     });
 
@@ -80,7 +85,9 @@ class ConfirmController {
       $scope.checkboxModel.virtualbox.detectExistingInstall(()=> {
         $scope.checkboxModel.vagrant.detectExistingInstall(()=> {
           $scope.checkboxModel.jdk.detectExistingInstall(()=> {
-            confCtrl.setIsDisabled();
+            $scope.checkboxModel.cygwin.detectExistingInstall(()=> {
+             confCtrl.setIsDisabled();
+            });
           });
         });
       });