Point to ruby 1.8 shim

Using a shim allows us to catch when 1.8 of ruby is not present and provide other options. #ignore
textmate · Jun 18, 2014 · e0823ef · e0823ef
1 parent bc3f1ee
commit e0823ef
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/Commands/Build & Run.plist b/Commands/Build & Run.plist
@@ -17,7 +17,7 @@
 #
 # if the build succeeds, it will run the target
 
-XCODE_PROJECT_FILE=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
+XCODE_PROJECT_FILE=$(ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
 export XCODE_PROJECT_FILE
 
 export XCODE_RUN_BUILD=1

diff --git a/Commands/Import Xcode Project….plist b/Commands/Import Xcode Project….plist
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 # import the frontmost opened project window in Xcode
 
 source_path = %x{osascript -e 'tell application "TextMate"

diff --git a/Commands/Jump to Next Error.tmCommand b/Commands/Jump to Next Error.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
+	<string>#!/usr/bin/env ruby18 -wKU
 
 require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
 

diff --git a/Commands/List Files in Active Target.plist b/Commands/List Files in Active Target.plist
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>PROJECT_FILE=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
+	<string>PROJECT_FILE=$(ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
 #PROJECT_FILE=${PROJECT_FILE##*/}
 
 "${TM_BUNDLE_SUPPORT}/bin/xcode_project.rb" project=${PROJECT_FILE} list</string>

diff --git a/Commands/New Project….tmCommand b/Commands/New Project….tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
+	<string>#!/usr/bin/env ruby18 -wKU
 
 SUPPORT       = ENV['TM_SUPPORT_PATH']
 MATE          = "#{SUPPORT}/bin/mate"

diff --git a/Commands/Open Project in Xcode.tmCommand b/Commands/Open Project in Xcode.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>PROJECT=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
+	<string>PROJECT=$(ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
 if [[ -f "${PROJECT}/project.pbxproj" ]]; then
    open -a Xcode "${PROJECT}"
 else

diff --git a/Commands/Run (xcode target).plist b/Commands/Run (xcode target).plist
@@ -8,7 +8,7 @@
 	<string>#!/usr/bin/env bash
 [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
 
-PROJECT=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
+PROJECT=$(ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
 if [[ -f "${PROJECT}/project.pbxproj" ]]; then
    "${TM_BUNDLE_SUPPORT}/bin/run_xcode_target.rb" -project_dir="$PROJECT"
 else

diff --git a/Support/bin/find_objroot.rb b/Support/bin/find_objroot.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#!/usr/bin/env ruby18
 
 require "#{ENV['TM_SUPPORT_PATH']}/lib/osx/plist"
 

diff --git a/Support/bin/find_xcode_project.rb b/Support/bin/find_xcode_project.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#!/usr/bin/env ruby18
 # Copyright 2005 Chris Thomas. All rights reserved.
 # MIT license; share and enjoy.
 require 'pathname'

diff --git a/Support/bin/run_xcode_target.rb b/Support/bin/run_xcode_target.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -s
+#!/usr/bin/env ruby18 -s
 # encoding: utf-8
 
 require "#{ENV['TM_SUPPORT_PATH']}/lib/osx/plist"

diff --git a/Support/bin/run_xcodebuild.sh b/Support/bin/run_xcodebuild.sh
@@ -19,10 +19,10 @@
 if [[ -n $XCODE_PROJECT_FILE ]]; then
 	PROJECT_FILE=$XCODE_PROJECT_FILE
 else
-	PROJECT_FILE=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
+	PROJECT_FILE=$(ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/find_xcode_project.rb")
 fi
 
-USE_CONFIGURATIONS=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/xcode_version.rb")
+USE_CONFIGURATIONS=$(ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/xcode_version.rb")
 
 #
 # Get into the correct directory and make the project file relative to it
@@ -68,4 +68,4 @@ OBJROOT=$("${TM_BUNDLE_SUPPORT}"/bin/find_objroot.rb)
 echo $OBJROOT
 
 export PROJECT_FILE
-xcodebuild ${PROJECT_FILE:+-project "$PROJECT_FILE"} ${TM_TARGET:+-target $TM_TARGET} $BUILD_STYLE $XCODE_BUILD_VERB ${OBJROOT:+"OBJROOT=$OBJROOT"} 2>&1| /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "${TM_BUNDLE_SUPPORT}/bin/format_build_output.rb"
+xcodebuild ${PROJECT_FILE:+-project "$PROJECT_FILE"} ${TM_TARGET:+-target $TM_TARGET} $BUILD_STYLE $XCODE_BUILD_VERB ${OBJROOT:+"OBJROOT=$OBJROOT"} 2>&1| ruby18 -- "${TM_BUNDLE_SUPPORT}/bin/format_build_output.rb"
diff --git a/Support/bin/xcode_project.rb b/Support/bin/xcode_project.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#!/usr/bin/env ruby18
 
 # class XcodeApplication < Object
 # 	attr_accessor :active_project

diff --git a/Support/bin/xcode_version.rb b/Support/bin/xcode_version.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#!/usr/bin/env ruby18
 # Copyright 2005 Chris Thomas. All rights reserved.
 # MIT license; share and enjoy.