Enable linking on other operating systems

assets/scripts/createShortcut.ps1

@@ -0,0 +1,6 @@
+param ( [string]$SourceExe, [string]$DestinationPath )
+
+$WshShell = New-Object -comObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut($DestinationPath)
+$Shortcut.TargetPath = $SourceExe
+$Shortcut.Save()

go.mod

@@ -28,7 +28,7 @@ require (
  github.com/fatih/color v1.5.0
  github.com/fsnotify/fsnotify v1.4.7
  github.com/go-ini/ini v1.32.0 // indirect
- github.com/go-ole/go-ole v1.2.4
+ github.com/go-ole/go-ole v1.2.4 // indirect
  github.com/go-openapi/analysis v0.0.0-20180418034448-863ac7f90e00 // indirect
  github.com/go-openapi/errors v0.0.0-20171226161601-7bcb96a367ba
  github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa // indirect

internal/fileutils/fileutils.go

@@ -18,6 +18,7 @@ import (
  "github.com/ActiveState/cli/internal/failures"
  "github.com/ActiveState/cli/internal/locale"
  "github.com/ActiveState/cli/internal/logging"
+ "github.com/google/uuid"
 )
 
 // FailFindInPathNotFound indicates the specified file was not found in the given path or parent directories
@@ -742,3 +743,19 @@ func HomeDir() (string, error) {
 
  return usr.HomeDir, nil
 }
+
+// IsWritable returns true if the given path is writable
+func IsWritable(path string) bool {
+ fpath := filepath.Join(path, uuid.New().String())
+ if fail := Touch(fpath); fail != nil {
+ logging.Error("Could not create file: %v", fail.ToError())
+ return false
+ }
+
+ if errr := os.Remove(fpath); errr != nil {
+ logging.Error("Could not clean up test file: %v", errr)
+ return false
+ }
+
+ return true
+}

internal/runners/deploy/deploy.go

@@ -3,6 +3,7 @@ package deploy
 import (
  "os"
  "path/filepath"
+ rt "runtime"
  "strings"
 
  "github.com/thoas/go-funk"
@@ -154,7 +155,7 @@ func install(installer installable, out output.Outputer) (runtime.EnvGetter, err
  if fail != nil {
  return envGetter, errs.Wrap(fail, "Install failed")
  }
- if !installed {
+ if ! installed {
  out.Notice(locale.T("using_cached_env"))
  }
  return envGetter, nil
@@ -224,7 +225,7 @@ func symlinkWithTarget(overwrite bool, path string, bins []string, out output.Ou
  for _, bin := range bins {
  err := filepath.Walk(bin, func(fpath string, info os.FileInfo, err error) error {
  // Filter out files that are not executable
- if info == nil || info.IsDir() || !executable(fpath, info) { // check if executable by anyone
+ if info == nil || info.IsDir() || !fileutils.IsExecutable(fpath) { // check if executable by anyone
  return nil // not executable
  }
 
@@ -279,7 +280,11 @@ func report(envGetter runtime.EnvGetter, out output.Outputer) error {
  Environment: env,
  })
 
- out.Notice(locale.T("deploy_restart_shell"))
+ if rt.GOOS == "windows" {
+ out.Notice(locale.T("deploy_restart_cmd"))
+ } else {
+ out.Notice(locale.T("deploy_restart_shell"))
+ }
 
  return nil
 }
@@ -297,7 +302,13 @@ func usablePath() (string, error) {
  }
  var result string
  for _, path := range paths {
- if !isWritable(path) {
+ info, err := os.Stat(path)
+ if err != nil {
+ logging.Debug("Could not stat path: %v", err)
+ continue
+ }
+
+ if path == "" || !info.IsDir() || !fileutils.IsWritable(path) {
  continue
  }
 

internal/runners/deploy/deploy_test.go

@@ -1,18 +1,12 @@
 package deploy
 
 import (
- "io/ioutil"
  "os"
- "os/exec"
- "path/filepath"
  "reflect"
  rt "runtime"
- "strings"
  "testing"
 
- "github.com/ActiveState/cli/internal/environment"
  "github.com/ActiveState/cli/internal/failures"
- "github.com/ActiveState/cli/internal/fileutils"
  "github.com/ActiveState/cli/internal/output"
  "github.com/ActiveState/cli/internal/testhelpers/outputhelper"
  "github.com/ActiveState/cli/pkg/platform/runtime"
@@ -40,15 +34,6 @@ func (e *EnvGetMock) GetEnv(inherit bool, projectDir string) (map[string]string,
  return e.callback(inherit, projectDir)
 }
 
-type OutputterMock struct{}
-
-func (o *OutputterMock) Print(value interface{}) {}
-func (o *OutputterMock) Error(value interface{}) {}
-func (o *OutputterMock) Notice(value interface{}) {}
-func (o *OutputterMock) Config() *output.Config {
- return nil
-}
-
 func Test_runStepsWithFuncs(t *testing.T) {
  type args struct {
  installer installable
@@ -185,7 +170,11 @@ func Test_report(t *testing.T) {
  "KEY1": "VAL1",
  "KEY2": "VAL2",
  }
- prepareDeployEnv(baseEnv)
+
+ if rt.GOOS == "windows" {
+ originalExtenstions := os.Getenv("PATHEXT")
+ baseEnv["PATHEXT"] = originalExtenstions + ";.LNK"
+ }
 
  type args struct {
  envGetter runtime.EnvGetter
@@ -202,7 +191,7 @@ func Test_report(t *testing.T) {
  args{
  &EnvGetMock{
  func(inherit bool, projectDir string) (map[string]string, *failures.Failure) {
- baseEnv["PATH"] = "PATH1" + string(os.PathListSeparator) + "PATH2"
+ baseEnv["PATH"] = "PATH1" + string(os.PathListSeparator) + "PATH2" 
  return baseEnv, nil
  },
  },
@@ -235,97 +224,3 @@ func Test_report(t *testing.T) {
  })
  }
 }
-
-func Test_symlinkWithTarget(t *testing.T) {
- root, err := environment.GetRootPath()
- if err != nil {
- t.Error(err)
- }
-
- testDataDir := filepath.Join(root, "internal", "runners", "deploy", "testdata")
- testFile := filepath.Join(testDataDir, "main.go")
- binaryName := "test-bin"
- if rt.GOOS == "windows" {
- binaryName += ".exe"
- }
-
- cmd := exec.Command("go", "build", "-o", filepath.Join(testDataDir, binaryName), testFile)
- err = cmd.Run()
- if err != nil {
- t.Error(err)
- }
-
- installDir, err := ioutil.TempDir("", "install-dir")
- if err != nil {
- t.Error(err)
- }
-
- targetDir, err := ioutil.TempDir("", "target-dir")
- if err != nil {
- t.Error(err)
- }
-
- fail := fileutils.CopyFile(filepath.Join(testDataDir, binaryName), filepath.Join(installDir, binaryName))
- if fail != nil {
- t.Error(fail.ToError())
- }
-
- if rt.GOOS != "windows" {
- cmd = exec.Command("chmod", "+x", filepath.Join(installDir, binaryName))
- err = cmd.Run()
- if err != nil {
- t.Error(err)
- }
- }
-
- type args struct {
- overwrite bool
- path string
- bins []string
- out output.Outputer
- }
- tests := []struct {
- name string
- args args
- wantErr bool
- }{
- {
- name: "Symlink binary file",
- args: args{
- overwrite: false,
- path: targetDir,
- bins: []string{installDir},
- out: &OutputterMock{},
- },
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- if err := symlinkWithTarget(tt.args.overwrite, tt.args.path, tt.args.bins, tt.args.out); (err != nil) != tt.wantErr {
- t.Errorf("symlinkWithTarget() error = %v, wantErr %v", err, tt.wantErr)
- }
- defer func() {
- os.RemoveAll(installDir)
- os.RemoveAll(targetDir)
- os.Remove(filepath.Join(testDataDir, binaryName))
- }()
-
- var cmd *exec.Cmd
- if rt.GOOS == "windows" {
- shortcut := strings.TrimSuffix(binaryName, ".exe")
- shortcut += ".lnk"
- cmd = exec.Command("cmd.exe", "/c", filepath.Join(targetDir, shortcut))
- } else {
- cmd = exec.Command(filepath.Join(targetDir, binaryName))
- }
-
- out, err := cmd.Output()
- if err != nil {
- t.Error(err)
- }
- if strings.TrimSpace(string(out)) != "Hello World!" {
- t.Fatalf("Unexpected output: %s", string(out))
- }
- })
- }
-}