Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-2211

External Diff Tool Can't Be Launched Due to PATH Order

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Low
    • None
    • 1.8.1
    • None
    • None
    • Severity 3 - Minor

    Description

      Steps to reproduce:

      1. Install (eg.) ImageMagick's "compare" in /usr/local/bin.
      2. Install AraxisMerge.
      3. Set up AraxisMerge as an "External Diff / Merge" under Preferences... > Diff
      4. Create a merge conflict in a repository.
      5. Right click and Resolve Merge Conflicts > Launch External Merge Tool
      6. Nothing happens.

      This is because of the following:

      • araxiscompare-w.sh
        export PATH=~/bin:/usr/bin:/bin:/Applications/Araxis\ Merge.app/Contents/Utilities
        
      • araxisgitmerge-w.sh
        export PATH=~/bin:/Applications/Araxis\ Merge.app/Contents/Utilities:/usr/local/bin:/usr/bin:/bin:$PATH
        
      • araxishgmerge-w.sh
        export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/Applications/Araxis\ Merge.app/Contents/Utilities:$PATH
        

      The current workaround is to change these scripts and place Applications/Araxis\ Merge.app/Contents/Utilities before /usr/local/bin

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              rluispereiramartins RicardoA
              Votes:
              2 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: