Skip to content

Commit fb81ffb

Browse files
author
Matt Turner
committed
Merge pull request #129 from thshdw/run-cmd-in-current-terminal
iTerm Nightly Support - AppleScript Changes - Et al.
2 parents 45252d9 + e61d19f commit fb81ffb

25 files changed

+563
-127
lines changed

‎Shuttle.xcodeproj/project.pbxproj‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
0ADB3B0F178EF8DB004E9BB9 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 0ADB3B0B178EF8DB004E9BB9 /* [email protected] */; };
1414
0ADB3B13178F3DE4004E9BB9 /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ADB3B12178F3DE4004E9BB9 /* LaunchAtLoginController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
1515
7E74A7C61789CE2F0079E0D2 /* shuttle.default.json in Resources */ = {isa = PBXBuildFile; fileRef = 7E74A7C51789CE2F0079E0D2 /* shuttle.default.json */; };
16+
A12D9BF01BCF2C73004F52A6 /* iTerm-stable-current-window.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BE71BCF2C72004F52A6 /* iTerm-stable-current-window.scpt */; };
17+
A12D9BF11BCF2C73004F52A6 /* iTerm-stable-new-tab-default.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BE81BCF2C72004F52A6 /* iTerm-stable-new-tab-default.scpt */; };
18+
A12D9BF21BCF2C73004F52A6 /* iTerm-stable-new-window.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BE91BCF2C72004F52A6 /* iTerm-stable-new-window.scpt */; };
19+
A12D9BF31BCF2C73004F52A6 /* iTerm2-nightly-current-window.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BEA1BCF2C73004F52A6 /* iTerm2-nightly-current-window.scpt */; };
20+
A12D9BF41BCF2C73004F52A6 /* iTerm2-nightly-new-tab-default.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BEB1BCF2C73004F52A6 /* iTerm2-nightly-new-tab-default.scpt */; };
21+
A12D9BF51BCF2C73004F52A6 /* iTerm2-nightly-new-window.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BEC1BCF2C73004F52A6 /* iTerm2-nightly-new-window.scpt */; };
22+
A12D9BF61BCF2C73004F52A6 /* terminal-current-window.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BED1BCF2C73004F52A6 /* terminal-current-window.scpt */; };
23+
A12D9BF71BCF2C73004F52A6 /* terminal-new-tab-default.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BEE1BCF2C73004F52A6 /* terminal-new-tab-default.scpt */; };
24+
A12D9BF81BCF2C73004F52A6 /* terminal-new-window.scpt in Resources */ = {isa = PBXBuildFile; fileRef = A12D9BEF1BCF2C73004F52A6 /* terminal-new-window.scpt */; };
1625
A1D700071A5DCE8D003563E4 /* AboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A1D700061A5DCE8D003563E4 /* AboutWindowController.m */; };
1726
A1D700091A5DCFE1003563E4 /* AboutWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1D700081A5DCFE1003563E4 /* AboutWindowController.xib */; };
1827
C149EBFE15D5214600B1F558 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C149EBFD15D5214600B1F558 /* Cocoa.framework */; };
@@ -33,6 +42,15 @@
3342
0ADB3B12178F3DE4004E9BB9 /* LaunchAtLoginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = "<group>"; };
3443
7E72D21E178003ED00A6389C /* Shuttle.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Shuttle.entitlements; sourceTree = "<group>"; };
3544
7E74A7C51789CE2F0079E0D2 /* shuttle.default.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = shuttle.default.json; sourceTree = "<group>"; };
45+
A12D9BE71BCF2C72004F52A6 /* iTerm-stable-current-window.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTerm-stable-current-window.scpt"; sourceTree = "<group>"; };
46+
A12D9BE81BCF2C72004F52A6 /* iTerm-stable-new-tab-default.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTerm-stable-new-tab-default.scpt"; sourceTree = "<group>"; };
47+
A12D9BE91BCF2C72004F52A6 /* iTerm-stable-new-window.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTerm-stable-new-window.scpt"; sourceTree = "<group>"; };
48+
A12D9BEA1BCF2C73004F52A6 /* iTerm2-nightly-current-window.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTerm2-nightly-current-window.scpt"; sourceTree = "<group>"; };
49+
A12D9BEB1BCF2C73004F52A6 /* iTerm2-nightly-new-tab-default.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTerm2-nightly-new-tab-default.scpt"; sourceTree = "<group>"; };
50+
A12D9BEC1BCF2C73004F52A6 /* iTerm2-nightly-new-window.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTerm2-nightly-new-window.scpt"; sourceTree = "<group>"; };
51+
A12D9BED1BCF2C73004F52A6 /* terminal-current-window.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "terminal-current-window.scpt"; sourceTree = "<group>"; };
52+
A12D9BEE1BCF2C73004F52A6 /* terminal-new-tab-default.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "terminal-new-tab-default.scpt"; sourceTree = "<group>"; };
53+
A12D9BEF1BCF2C73004F52A6 /* terminal-new-window.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "terminal-new-window.scpt"; sourceTree = "<group>"; };
3654
A1D700051A5DCDF4003563E4 /* AboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutWindowController.h; sourceTree = "<group>"; };
3755
A1D700061A5DCE8D003563E4 /* AboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutWindowController.m; sourceTree = "<group>"; };
3856
A1D700081A5DCFE1003563E4 /* AboutWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AboutWindowController.xib; sourceTree = "<group>"; };
@@ -75,6 +93,22 @@
7593
name = Images;
7694
sourceTree = "<group>";
7795
};
96+
A12D9BE61BCF2C72004F52A6 /* apple-scpt */ = {
97+
isa = PBXGroup;
98+
children = (
99+
A12D9BE71BCF2C72004F52A6 /* iTerm-stable-current-window.scpt */,
100+
A12D9BE81BCF2C72004F52A6 /* iTerm-stable-new-tab-default.scpt */,
101+
A12D9BE91BCF2C72004F52A6 /* iTerm-stable-new-window.scpt */,
102+
A12D9BEA1BCF2C73004F52A6 /* iTerm2-nightly-current-window.scpt */,
103+
A12D9BEB1BCF2C73004F52A6 /* iTerm2-nightly-new-tab-default.scpt */,
104+
A12D9BEC1BCF2C73004F52A6 /* iTerm2-nightly-new-window.scpt */,
105+
A12D9BED1BCF2C73004F52A6 /* terminal-current-window.scpt */,
106+
A12D9BEE1BCF2C73004F52A6 /* terminal-new-tab-default.scpt */,
107+
A12D9BEF1BCF2C73004F52A6 /* terminal-new-window.scpt */,
108+
);
109+
path = "apple-scpt";
110+
sourceTree = "<group>";
111+
};
78112
C149EBEE15D5214600B1F558 = {
79113
isa = PBXGroup;
80114
children = (
@@ -114,6 +148,7 @@
114148
C149EC0315D5214600B1F558 /* Shuttle */ = {
115149
isa = PBXGroup;
116150
children = (
151+
A12D9BE61BCF2C72004F52A6 /* apple-scpt */,
117152
7E74A7C51789CE2F0079E0D2 /* shuttle.default.json */,
118153
7E72D21E178003ED00A6389C /* Shuttle.entitlements */,
119154
C159DC2715D5DE7F00F5DE24 /* shuttle.icns */,
@@ -194,15 +229,24 @@
194229
isa = PBXResourcesBuildPhase;
195230
buildActionMask = 2147483647;
196231
files = (
232+
A12D9BF61BCF2C73004F52A6 /* terminal-current-window.scpt in Resources */,
233+
A12D9BF31BCF2C73004F52A6 /* iTerm2-nightly-current-window.scpt in Resources */,
234+
A12D9BF51BCF2C73004F52A6 /* iTerm2-nightly-new-window.scpt in Resources */,
235+
A12D9BF21BCF2C73004F52A6 /* iTerm-stable-new-window.scpt in Resources */,
197236
0ADB3B0D178EF8DB004E9BB9 /* StatusIcon.png in Resources */,
237+
A12D9BF11BCF2C73004F52A6 /* iTerm-stable-new-tab-default.scpt in Resources */,
198238
0ADB3B0C178EF8DB004E9BB9 /* StatusIconAlt.png in Resources */,
199239
C149EC0815D5214600B1F558 /* InfoPlist.strings in Resources */,
200240
A1D700091A5DCFE1003563E4 /* AboutWindowController.xib in Resources */,
201241
0ADB3B0F178EF8DB004E9BB9 /* [email protected] in Resources */,
202242
0ADB3B0E178EF8DB004E9BB9 /* [email protected] in Resources */,
243+
A12D9BF41BCF2C73004F52A6 /* iTerm2-nightly-new-tab-default.scpt in Resources */,
203244
C149EC0E15D5214600B1F558 /* Credits.rtf in Resources */,
245+
A12D9BF01BCF2C73004F52A6 /* iTerm-stable-current-window.scpt in Resources */,
246+
A12D9BF71BCF2C73004F52A6 /* terminal-new-tab-default.scpt in Resources */,
204247
C149EC1415D5214600B1F558 /* MainMenu.xib in Resources */,
205248
C159DC2815D5DE8000F5DE24 /* shuttle.icns in Resources */,
249+
A12D9BF81BCF2C73004F52A6 /* terminal-new-window.scpt in Resources */,
206250
7E74A7C61789CE2F0079E0D2 /* shuttle.default.json in Resources */,
207251
);
208252
runOnlyForDeploymentPostprocessing = 0;

‎Shuttle/AppDelegate.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
NSStatusItem *statusItem;
1717
NSString *shuttleConfigFile;
18+
NSString *shuttleJSONPath;
1819

1920
// This is for the JSON File
2021
NSDate *configModified;
@@ -23,6 +24,7 @@
2324

2425
NSString *terminalPref;
2526
NSString *editorPref;
27+
NSString *iTermVersion;
2628
NSMutableArray* shuttleHosts;
2729
NSMutableArray* ignoreHosts;
2830
NSMutableArray* ignoreKeywords;

0 commit comments

Comments
 (0)